From badc50c1e3381431ff90786f3ba15c6464c430b2 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Mon, 8 Dec 2014 23:56:21 +0100 Subject: [PATCH 1/2] Support enabling fatal warnings via user_config.pri file --- README.md | 2 +- qgroundcontrol.pro | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 495690d..decbefc 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ Download Qt 5.3 from here: Date: Tue, 9 Dec 2014 23:11:26 +0100 Subject: [PATCH 2/2] Removed user_config.pri.dist, as it was bit-rotting --- README.md | 2 +- user_config.pri.dist | 36 ------------------------------------ 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 user_config.pri.dist diff --git a/README.md b/README.md index decbefc..c18eb12 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ Download Qt 5.3 from here: ). Since logging is on by default, an example qtlogging.ini file is included at the root of the repository which disables logging. Follow the instructions from Qt as to why and where to put this file. You can then edit the file to get a logging level that suits your needs. ## Additional functionality -QGroundcontrol has functionality that is dependent on the operating system and libraries installed by the user. The following sections describe these features, their dependencies, and how to disable/alter them during the build process. These features can be forcibly enabled/disabled by specifying additional values for variables either at the command line when calling `qmake` or in the `user_config.pri`. When calling `qmake` additional variables can be set using the syntax `VARIABLE="SPACE_SEPARATED_VALUES"`, which can be repeated for multiple variables. For example: `qmake DEFINES="DISABLE_QUPGRADE DISABLE_SPEECH" MAVLINK_CONF="sensesoar"` disables the QUpgrade widget, speech functionality, and sets the MAVLink dialect to sensesoar. These values can be more permanently specified by setting them in the `user_config.pri` file in the root directly. Copy the `user_config.pri.dist` file and name the copy `user_config.pri`, uncommenting the lines with the variables to modify and set their values as you desire. +QGroundcontrol has functionality that is dependent on the operating system and libraries installed by the user. The following sections describe these features, their dependencies, and how to disable/alter them during the build process. These features can be forcibly enabled/disabled by specifying additional values for variables either at the command line when calling `qmake` or in the `user_config.pri`. When calling `qmake` additional variables can be set using the syntax `VARIABLE="SPACE_SEPARATED_VALUES"`, which can be repeated for multiple variables. For example: `qmake DEFINES="DISABLE_QUPGRADE DISABLE_SPEECH" MAVLINK_CONF="sensesoar"` disables the QUpgrade widget, speech functionality, and sets the MAVLink dialect to sensesoar. These values can be more permanently specified by setting them in the `user_config.pri` file in the root directly. Create this file as a plain text file and ensure it ends in .pri (not .pri.txt!). **NOTE:** Any variables specified at the command line call to `qmake` will override those set in `user_config.pri`. diff --git a/user_config.pri.dist b/user_config.pri.dist deleted file mode 100644 index 81bdb3f..0000000 --- a/user_config.pri.dist +++ /dev/null @@ -1,36 +0,0 @@ -#------------------------------------------------- -# -# QGroundControl - Micro Air Vehicle Groundstation -# -# Please see our website at -# -# Author: -# Lorenz Meier -# -# (c) 2009-2010 PIXHAWK Team -# -# This file is part of the mav groundstation project -# QGroundControl is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# QGroundControl is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with QGroundControl. If not, see . -# -#------------------------------------------------- - -# Specify the MAVLink dialect to compile support for here. This variable is processed -# by QGCExternalLibs.pri, which handles MAVLink configuration. The dialect should -# correspond to an include folder under `libs/mavlink/include/mavlink/v1.0`. You can -# also force a build to use only common mavlink message by setting MAVLINK_CONF to empty here. -#MAVLINK_CONF = pixhawk - -# Override compilation of QGroundControl's features in your build. This overrides the default -# options for QGroundControl. To see what those are, refer to README.md. -# This should be a space-separated list of the constants specified in README.md. -# Uncomment the following line and replace DISABLE_XBEE with any features to override. -#DEFINES = DISABLE_XBEE