diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-12-14 11:33:15 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-21 22:58:50 +0100 |
| commit | 3225942dbb7faaeff477e137af9c3d78fcaf518e (patch) | |
| tree | 09654c68a4337f8a670fc24fe6a51a6da164fba1 /configure | |
| parent | cd796404f17e8ecfa32e108de47709e41072542f (diff) | |
configure[.exe]: use create_prl, link_prl for all modules
These should go into qmodule.pri, rather than .qmake.cache, as they
make sense for all Qt modules - not only qtbase.
Fixes link failure when building qtdeclarative with jom on Windows.
Change-Id: I3e8b207e1808cb23af58b865a160c2fafa906288
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -8021,6 +8021,8 @@ fi #------------------------------------------------------------------------------- QTMODULE="$outpath/mkspecs/qmodule.pri" +echo "CONFIG += create_prl link_prl" >> "$QTMODULE.tmp" + # Ensure we can link to uninistalled libraries 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" @@ -8103,7 +8105,7 @@ QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib 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 depend_includepath fix_output_dirs no_private_qt_headers_warning QTDIR_build QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc |