diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_common.prf | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 124e265eb4..888bd8f66e 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,4 +4,4 @@ CONFIG += warning_clean QT_SOURCE_TREE = $$PWD QT_BUILD_TREE = $$shadowed($$PWD) -MODULE_VERSION = 5.12.3 +MODULE_VERSION = 5.12.4 diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index ee65c70926..caecb68a84 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -50,6 +50,12 @@ contains(TEMPLATE, .*lib) { } lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace + !equals(qt_libdir, $$rplbase/lib) { + qtlibdir_replace.match = $$qt_libdir + qtlibdir_replace.replace = $$qqt_libdir + qtlibdir_replace.CONFIG = path + QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace + } } # The remainder of this file must not apply to host tools/libraries, |