configure{.exe}: enable 'tools' as a default build part
authorRohan McGovern <rohan.mcgovern@nokia.com>
Mon, 9 Jul 2012 22:58:19 +0000 (08:58 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 10 Jul 2012 06:33:49 +0000 (08:33 +0200)
Tools for each module should be enabled by default.

Prior to qt_parts.prf, they have been enabled by default, but only by
accident - the value of QT_BUILD_PARTS with respect to 'tools' was
generally not respected.

Change-Id: Icd49d6128d4050ff1c865967a563e9ab88c5a3a2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
configure
tools/configure/configureapp.cpp

index 4b287a0..6054437 100755 (executable)
--- a/configure
+++ b/configure
@@ -719,7 +719,7 @@ CFG_SSE=auto
 CFG_FONTCONFIG=auto
 CFG_LIBFREETYPE=auto
 CFG_SQL_AVAILABLE=
-QT_DEFAULT_BUILD_PARTS="libs examples"
+QT_DEFAULT_BUILD_PARTS="libs tools examples"
 CFG_BUILD_PARTS=""
 CFG_NOBUILD_PARTS=""
 CFG_RELEASE_QMAKE=no
index f2146e6..63d8b7d 100644 (file)
@@ -188,7 +188,7 @@ Configure::Configure(int& argc, char** argv)
         }
     }
 
-    defaultBuildParts << QStringLiteral("libs") << QStringLiteral("examples");
+    defaultBuildParts << QStringLiteral("libs") << QStringLiteral("tools") << QStringLiteral("examples");
     dictionary[ "QT_SOURCE_TREE" ]    = sourcePath;
     dictionary[ "QT_BUILD_TREE" ]     = buildPath;
     dictionary[ "QT_INSTALL_PREFIX" ] = installPath;