From 18ddd367b82af01a73954992f551bb0e68c029ae Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 10 Jul 2012 08:58:19 +1000 Subject: configure{.exe}: enable 'tools' as a default build part 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 --- configure | 2 +- tools/configure/configureapp.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 4b287a0aaf..6054437a5b 100755 --- 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 diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index f2146e6f51..63d8b7d291 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -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; -- cgit v1.2.3