diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-05-06 13:26:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-05-07 20:58:25 +0200 |
| commit | fc65683e65191ed03ecd96a22a491c81c0717003 (patch) | |
| tree | a5f29d17f0d22baf3b4805229d8ca59ae49c3e28 | |
| parent | 95b441d0979103a168856e461cc23e636c1890e3 (diff) | |
Revert "Don't reference build directory in helper lib pri"
This reverts commit c9d9ac5bb07a737c862b40302cd681f7b3b321fd.
This breaks prefix build which tries to link to install folder.
Task-number: QTBUG-83967
Change-Id: I084152afde91c2063154bef8ac99d7e997c9394b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| -rw-r--r-- | mkspecs/features/qt_helper_lib.prf | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index 5838b3bc0c..2bb01515be 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -62,26 +62,26 @@ win32|CONFIG(static, static|shared) { MODULE_PRI_CONT += "QMAKE_LIBS_$${ucmodule} =" } else: if(msvc|qtConfig(debug_and_release)): { win32: \ - MODULE_DEBUG_LIBS = $$prefix$${TARGET}d.$$suffix + MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}d.$$suffix else: darwin: \ - MODULE_DEBUG_LIBS = $$prefix$${TARGET}_debug.$$suffix + MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}_debug.$$suffix else: \ error("'$$QMAKE_PLATFORM' does not do debug_and_release.") - MODULE_RELEASE_LIBS = $$prefix$${TARGET}.$$suffix + MODULE_RELEASE_LIBS = $$DESTDIR/$$prefix$${TARGET}.$$suffix MODULE_PRI_CONT += \ "QMAKE_LIBS_$${ucmodule} =" \ # Needed for the module to be recognized. - "QMAKE_LIBS_$${ucmodule}_DEBUG = \$\$[QT_INSTALL_LIBS/get]/$$val_escape(MODULE_DEBUG_LIBS)" \ - "QMAKE_LIBS_$${ucmodule}_RELEASE = \$\$[QT_INSTALL_LIBS/get]/$$val_escape(MODULE_RELEASE_LIBS)" + "QMAKE_LIBS_$${ucmodule}_DEBUG = $$val_escape(MODULE_DEBUG_LIBS)" \ + "QMAKE_LIBS_$${ucmodule}_RELEASE = $$val_escape(MODULE_RELEASE_LIBS)" } else { - MODULE_LIBS = $$prefix$${THE_TARGET}.$$suffix + MODULE_LIBS = $$DESTDIR/$$prefix$${THE_TARGET}.$$suffix MODULE_PRI_CONT += \ - "QMAKE_LIBS_$${ucmodule} = \$\$[QT_INSTALL_LIBS/get]/$$val_escape(MODULE_LIBS)" + "QMAKE_LIBS_$${ucmodule} = $$val_escape(MODULE_LIBS)" } write_file($$MODULE_PRI, MODULE_PRI_CONT)|error() } else: android { ABI_TARGET = $$qt5LibraryTarget($$TARGET) - ABI_MODULE_LIBS = $$prefix$${ABI_TARGET}.$$suffix - MODULE_PRI_CONT = "QMAKE_LIBS_$${ucmodule}_$${QT_ARCH} = \$\$[QT_INSTALL_LIBS/get]/$$val_escape(ABI_MODULE_LIBS)" + ABI_MODULE_LIBS = $$DESTDIR/$$prefix$${ABI_TARGET}.$$suffix + MODULE_PRI_CONT = "QMAKE_LIBS_$${ucmodule}_$${QT_ARCH} = $$val_escape(ABI_MODULE_LIBS)" write_file($$MODULE_PRI, MODULE_PRI_CONT, append)|error() } |