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>
This commit is contained in:
Oswald Buddenhagen 2013-11-13 14:59:30 +01:00 committed by The Qt Project
parent 862fbd98cd
commit 925899dcd6

8
configure vendored
View File

@ -2459,10 +2459,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then
[ "$OPT_VERBOSE" = "yes" ] && echo "Performing shadow build..." [ "$OPT_VERBOSE" = "yes" ] && echo "Performing shadow build..."
fi fi
if [ "$CFG_SILENT" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG silent"
fi
# if the source tree is different from the build tree, # if the source tree is different from the build tree,
# symlink or copy part of the sources # symlink or copy part of the sources
if [ "$OPT_SHADOW" = "yes" ]; then if [ "$OPT_SHADOW" = "yes" ]; then
@ -5846,6 +5842,10 @@ fi
[ "$CFG_CXX11" = "yes" ] && QT_CONFIG="$QT_CONFIG c++11" [ "$CFG_CXX11" = "yes" ] && QT_CONFIG="$QT_CONFIG c++11"
if [ "$CFG_SILENT" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG silent"
fi
# disable accessibility # disable accessibility
if [ "$CFG_ACCESSIBILITY" = "no" ]; then if [ "$CFG_ACCESSIBILITY" = "no" ]; then
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ACCESSIBILITY" QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ACCESSIBILITY"