summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure
index 6d6b816c30..dee86c2704 100755
--- a/configure
+++ b/configure
@@ -2609,7 +2609,7 @@ if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
fi
if [ "$CFG_FORCEDEBUGINFO" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG force_debug_info"
+ QMAKE_CONFIG="$QMAKE_CONFIG force_debug_info"
fi
# pass on $CFG_SDK to the arch/configure tests.
@@ -3095,6 +3095,9 @@ Configure options:
-opensource ........ Compile and link the Open-Source Edition of Qt.
-commercial ........ Compile and link the Commercial Edition of Qt.
+ -confirm-license.... Automatically acknowledge the license (use with
+ either -opensource or -commercial)
+
-no-c++11 .......... Do not compile Qt with C++11 support enabled.
+ -c++11 ............. Compile Qt with C++11 support enabled.
@@ -3199,7 +3202,7 @@ Third Party Libraries:
Additional options:
-make <part> ....... Add part to the list of parts to be built at make time.
- ($QT_DEFAULT_BUILD_PARTS)
+ (defaults to: $QT_DEFAULT_BUILD_PARTS)
-nomake <part> ..... Exclude part from the list of parts to be built.
-skip <module> ..... Exclude an entire module from the build.