From 77b293d2ff5ae859535c890cd2a5ee8cda0757d1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 6 Jul 2012 19:39:26 +0200 Subject: make QT_BUILD_PARTS setting in qmodule.pri additive that way it is actually possible to add additional parts from the qmake command line. Change-Id: I42e0b58424292cebafb57538a879204d370397bb Reviewed-by: Rohan McGovern --- configure | 2 +- tools/configure/configureapp.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 36576c2124..4b287a0aaf 100755 --- a/configure +++ b/configure @@ -5849,7 +5849,7 @@ fi QTMODULE="$outpath/mkspecs/qmodule.pri" echo "CONFIG += $QMAKE_CONFIG create_prl link_prl" >> "$QTMODULE.tmp" -echo "QT_BUILD_PARTS = $CFG_BUILD_PARTS" >> "$QTMODULE.tmp" +echo "QT_BUILD_PARTS += $CFG_BUILD_PARTS" >> "$QTMODULE.tmp" # Ensure we can link to uninistalled libraries if [ "$BUILD_ON_MAC" != "yes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 26160976bb..d311ff6573 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2672,7 +2672,7 @@ void Configure::generateCachefile() moduleStream << "#paths" << endl; moduleStream << "QT_BUILD_TREE = " << formatPath(dictionary["QT_BUILD_TREE"]) << endl; moduleStream << "QT_SOURCE_TREE = " << formatPath(dictionary["QT_SOURCE_TREE"]) << endl; - moduleStream << "QT_BUILD_PARTS = " << buildParts.join(" ") << endl << endl; + moduleStream << "QT_BUILD_PARTS += " << buildParts.join(" ") << endl << endl; if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE") moduleStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl; -- cgit v1.2.3