diff options
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 6 |
2 files changed, 7 insertions, 3 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 diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index a831825346..8ae06c3c8a 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2666,7 +2666,7 @@ void Configure::generateCachefile() for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) { cacheStream << (*var) << endl; } - cacheStream << "CONFIG += " << qmakeConfig.join(" ") << " incremental msvc_mp create_prl link_prl depend_includepath no_private_qt_headers_warning QTDIR_build" << endl; + cacheStream << "CONFIG += " << qmakeConfig.join(" ") << " incremental msvc_mp depend_includepath no_private_qt_headers_warning QTDIR_build" << endl; cacheStream.flush(); cacheFile.close(); @@ -2740,7 +2740,9 @@ void Configure::generateCachefile() moduleStream << "decorations += "<<dictionary["DECORATIONS"]<<endl; if (!dictionary["QMAKE_RPATHDIR"].isEmpty()) - moduleStream << "QMAKE_RPATHDIR += "<<dictionary["QMAKE_RPATHDIR"]; + moduleStream << "QMAKE_RPATHDIR += "<<dictionary["QMAKE_RPATHDIR"]<<endl; + + moduleStream << "CONFIG += create_prl link_prl" << endl; moduleStream.flush(); moduleFile.close(); |