summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-07-02 11:59:42 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-03 16:48:33 +0200
commit0002464b46f3b42218933377d545e49fef65aa51 (patch)
treeada79faaab312b9ea68aeb5919f7debe70ab27aa
parent1b4087ae0c15421d62f9f0cdb6a9c97997fd6ceb (diff)
store QT_BUILD_PARTS in qmodule.pri also on unix
modules other than qtbase also need it. the windows configure already does it that way. Change-Id: I9adb469f7a0726663b7939e80d8be1e83a6d12d3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 27b93e76fb..23bc420336 100755
--- a/configure
+++ b/configure
@@ -5840,6 +5840,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"
# Ensure we can link to uninistalled libraries
if [ "$BUILD_ON_MAC" != "yes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then
@@ -5907,7 +5908,6 @@ cat >>"$CACHEFILE.tmp" <<EOF
#paths
QT_SOURCE_TREE = \$\$quote($relpath)
QT_BUILD_TREE = \$\$quote($outpath)
-QT_BUILD_PARTS = $CFG_BUILD_PARTS
include(\$\$PWD/mkspecs/qmodule.pri)
CONFIG += dylib depend_includepath fix_output_dirs no_private_qt_headers_warning QTDIR_build