summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-11-13 14:59:30 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-20 08:04:07 +0100
commit925899dcd646237a379189197e94c3c2b67b7ac5 (patch)
treef81e814e6fc9169ea17aab3649450e739c34ff4d
parent862fbd98cd04e71e574897696cc5f3687c15974e (diff)
do CONFIG+=silent after configure tests
it's counterproductive to do it earlier: it's passed down to configure tests, which then log less info than they could. but primarily, this serves the purpose of minimizing the amount of code executed before platform detection. Change-Id: Iff19b8555de19d048ea6d9341af965871b314c54 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rwxr-xr-xconfigure8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index 7d642fc017..5b2ff1b9a6 100755
--- a/configure
+++ b/configure
@@ -2459,10 +2459,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then
[ "$OPT_VERBOSE" = "yes" ] && echo "Performing shadow build..."
fi
-if [ "$CFG_SILENT" = "yes" ]; then
- QMAKE_CONFIG="$QMAKE_CONFIG silent"
-fi
-
# if the source tree is different from the build tree,
# symlink or copy part of the sources
if [ "$OPT_SHADOW" = "yes" ]; then
@@ -5846,6 +5842,10 @@ fi
[ "$CFG_CXX11" = "yes" ] && QT_CONFIG="$QT_CONFIG c++11"
+if [ "$CFG_SILENT" = "yes" ]; then
+ QMAKE_CONFIG="$QMAKE_CONFIG silent"
+fi
+
# disable accessibility
if [ "$CFG_ACCESSIBILITY" = "no" ]; then
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ACCESSIBILITY"