1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't reference build directory in helper lib pri

Browse Source 
Otherwise the helper-lib pri file will be unusable when installed.

Change-Id: Id79a61e6ca9bb1b32c82ee158fd18f51319c484e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-04-29 15:23:56 +02:00
parent f3bfee0cb6
commit c9d9ac5bb0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mkspecs/features/qt_helper_lib.prf
View File

@ -62,26 +62,26 @@ win32|CONFIG(static, static|shared) {
MODULE_PRI_CONT += "QMAKE_LIBS_$${ucmodule} =" MODULE_PRI_CONT += "QMAKE_LIBS_$${ucmodule} ="
} else: if(msvc|qtConfig(debug_and_release)): { } else: if(msvc|qtConfig(debug_and_release)): {
win32: \ win32: \
MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}d.$$suffix MODULE_DEBUG_LIBS = $$prefix$${TARGET}d.$$suffix
else: darwin: \ else: darwin: \
MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}_debug.$$suffix MODULE_DEBUG_LIBS = $$prefix$${TARGET}_debug.$$suffix
else: \ else: \
error("'$$QMAKE_PLATFORM' does not do debug_and_release.") error("'$$QMAKE_PLATFORM' does not do debug_and_release.")
MODULE_RELEASE_LIBS = $$DESTDIR/$$prefix$${TARGET}.$$suffix MODULE_RELEASE_LIBS = $$prefix$${TARGET}.$$suffix
MODULE_PRI_CONT += \ MODULE_PRI_CONT += \
"QMAKE_LIBS_$${ucmodule} =" \ # Needed for the module to be recognized. "QMAKE_LIBS_$${ucmodule} =" \ # Needed for the module to be recognized.
"QMAKE_LIBS_$${ucmodule}_DEBUG = $$val_escape(MODULE_DEBUG_LIBS)" \ "QMAKE_LIBS_$${ucmodule}_DEBUG = \$\$[QT_INSTALL_LIBS/get]/$$val_escape(MODULE_DEBUG_LIBS)" \
"QMAKE_LIBS_$${ucmodule}_RELEASE = $$val_escape(MODULE_RELEASE_LIBS)" "QMAKE_LIBS_$${ucmodule}_RELEASE = \$\$[QT_INSTALL_LIBS/get]/$$val_escape(MODULE_RELEASE_LIBS)"
} else { } else {
MODULE_LIBS = $$DESTDIR/$$prefix$${THE_TARGET}.$$suffix MODULE_LIBS = $$prefix$${THE_TARGET}.$$suffix
MODULE_PRI_CONT += \ MODULE_PRI_CONT += \
"QMAKE_LIBS_$${ucmodule} = $$val_escape(MODULE_LIBS)" "QMAKE_LIBS_$${ucmodule} = \$\$[QT_INSTALL_LIBS/get]/$$val_escape(MODULE_LIBS)"
} }
write_file($$MODULE_PRI, MODULE_PRI_CONT)|error() write_file($$MODULE_PRI, MODULE_PRI_CONT)|error()
} else: android { } else: android {
ABI_TARGET = $$qt5LibraryTarget($$TARGET) ABI_TARGET = $$qt5LibraryTarget($$TARGET)
ABI_MODULE_LIBS = $$DESTDIR/$$prefix$${ABI_TARGET}.$$suffix ABI_MODULE_LIBS = $$prefix$${ABI_TARGET}.$$suffix
MODULE_PRI_CONT = "QMAKE_LIBS_$${ucmodule}_$${QT_ARCH} = $$val_escape(ABI_MODULE_LIBS)" MODULE_PRI_CONT = "QMAKE_LIBS_$${ucmodule}_$${QT_ARCH} = \$\$[QT_INSTALL_LIBS/get]/$$val_escape(ABI_MODULE_LIBS)"
write_file($$MODULE_PRI, MODULE_PRI_CONT, append)|error() write_file($$MODULE_PRI, MODULE_PRI_CONT, append)|error()
} }