Moved certain qmake config variables to .qmake.cache.
The reason is that these are local to the build, and should not be present inside the qmodule.pri file, because this file is installed. Change-Id: I2207f2bf068b1aafd14e60d106c7028ca53d5efd Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/238 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
parent
a3146bb75f
commit
0b2ce85200
43
configure
vendored
43
configure
vendored
@ -8472,22 +8472,6 @@ fi
|
|||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
QTMODULE="$outpath/mkspecs/qmodule.pri"
|
QTMODULE="$outpath/mkspecs/qmodule.pri"
|
||||||
|
|
||||||
cat >>"$QTMODULE.tmp" <<EOF
|
|
||||||
#paths
|
|
||||||
QT_SOURCE_TREE = \$\$quote($relpath)
|
|
||||||
QT_BUILD_TREE = \$\$quote($outpath)
|
|
||||||
QT_BUILD_PARTS = $CFG_BUILD_PARTS
|
|
||||||
|
|
||||||
#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
|
|
||||||
QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc
|
|
||||||
QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic
|
|
||||||
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
|
|
||||||
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
|
|
||||||
QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
|
|
||||||
QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
|
|
||||||
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Ensure we can link to uninistalled libraries
|
# Ensure we can link to uninistalled libraries
|
||||||
if [ "$XPLATFORM_MINGW" != "yes" ] && [ "$CFG_EMBEDDED" != "nacl" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then
|
if [ "$XPLATFORM_MINGW" != "yes" ] && [ "$CFG_EMBEDDED" != "nacl" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then
|
||||||
echo "QMAKE_LFLAGS = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$QTMODULE.tmp"
|
echo "QMAKE_LFLAGS = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$QTMODULE.tmp"
|
||||||
@ -8538,13 +8522,6 @@ if [ "$CFG_MAC_XARCH" = "no" ]; then
|
|||||||
echo "QMAKE_MAC_XARCH = no" >> "$QTMODULE.tmp"
|
echo "QMAKE_MAC_XARCH = no" >> "$QTMODULE.tmp"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#dump the qmake spec
|
|
||||||
if [ -d "$outpath/mkspecs/$XPLATFORM" ]; then
|
|
||||||
echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$QTMODULE.tmp"
|
|
||||||
else
|
|
||||||
echo "QMAKESPEC = $XPLATFORM" >> "$QTMODULE.tmp"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# cmdline args
|
# cmdline args
|
||||||
cat "$QMAKE_VARS_FILE" >> "$QTMODULE.tmp"
|
cat "$QMAKE_VARS_FILE" >> "$QTMODULE.tmp"
|
||||||
rm -f "$QMAKE_VARS_FILE" 2>/dev/null
|
rm -f "$QMAKE_VARS_FILE" 2>/dev/null
|
||||||
@ -8563,6 +8540,19 @@ fi
|
|||||||
CACHEFILE="$outpath/.qmake.cache"
|
CACHEFILE="$outpath/.qmake.cache"
|
||||||
[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp"
|
[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp"
|
||||||
cat >>"$CACHEFILE.tmp" <<EOF
|
cat >>"$CACHEFILE.tmp" <<EOF
|
||||||
|
#paths
|
||||||
|
QT_SOURCE_TREE = \$\$quote($relpath)
|
||||||
|
QT_BUILD_TREE = \$\$quote($outpath)
|
||||||
|
QT_BUILD_PARTS = $CFG_BUILD_PARTS
|
||||||
|
|
||||||
|
#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
|
||||||
|
QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc
|
||||||
|
QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic
|
||||||
|
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
|
||||||
|
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
|
||||||
|
QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
|
||||||
|
QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
|
||||||
|
|
||||||
include(\$\$PWD/mkspecs/qmodule.pri)
|
include(\$\$PWD/mkspecs/qmodule.pri)
|
||||||
CONFIG += $QMAKE_CONFIG dylib create_prl link_prl depend_includepath fix_output_dirs no_private_qt_headers_warning QTDIR_build
|
CONFIG += $QMAKE_CONFIG dylib create_prl link_prl depend_includepath fix_output_dirs no_private_qt_headers_warning QTDIR_build
|
||||||
QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
|
QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
|
||||||
@ -8570,6 +8560,13 @@ QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
|
|||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
#dump the qmake spec
|
||||||
|
if [ -d "$outpath/mkspecs/$XPLATFORM" ]; then
|
||||||
|
echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$CACHEFILE.tmp"
|
||||||
|
else
|
||||||
|
echo "QMAKESPEC = $XPLATFORM" >> "$CACHEFILE.tmp"
|
||||||
|
fi
|
||||||
|
|
||||||
# incrementals
|
# incrementals
|
||||||
INCREMENTAL=""
|
INCREMENTAL=""
|
||||||
[ "$CFG_INCREMENTAL" = "auto" ] && "$WHICH" p4 >/dev/null 2>&1 && [ "$CFG_DEV" = "yes" ] && CFG_INCREMENTAL="yes"
|
[ "$CFG_INCREMENTAL" = "auto" ] && "$WHICH" p4 >/dev/null 2>&1 && [ "$CFG_DEV" = "yes" ] && CFG_INCREMENTAL="yes"
|
||||||
|
Loading…
Reference in New Issue
Block a user