diff options
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 6 | ||||
| -rw-r--r-- | mkspecs/features/qt_module.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_fwdpri.prf | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 6da2bb6f36..a89f0838d7 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -109,11 +109,7 @@ defineTest(qtAddModule) { isEmpty(lib): lib = -l$${MODULE_NAME}$${QT_LIBINFIX} LINKAGE += $$lib - contains(QT_CONFIG, rpath) { - rpath = $$eval(QT.$${1}.rpath) - isEmpty(rpath): rpath = $$MODULE_LIBS - QMAKE_RPATHDIR *= $$rpath - } + contains(QT_CONFIG, rpath): QMAKE_RPATHDIR *= $$eval(QT.$${1}.rpath) # Make sure we can link to uninstalled libraries unix:!mac:!isEmpty(QT.$${1}.libs) { # Use unmodified path, so /usr/lib also works diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 5918f06755..0d004f29c8 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -79,6 +79,7 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri "QT.$${MODULE}.private_includes = $$MODULE_PRIVATE_INCLUDES" \ "QT.$${MODULE}.sources = $$val_escape(_PRO_FILE_PWD_)" \ "QT.$${MODULE}.libs = \$\$QT_MODULE_LIB_BASE" \ + "QT.$${MODULE}.rpath = $$[QT_INSTALL_LIBS/raw]" \ "QT.$${MODULE}.plugins = \$\$QT_MODULE_PLUGIN_BASE" \ "QT.$${MODULE}.imports = \$\$QT_MODULE_IMPORT_BASE$$MODULE_IMPORT_SUFFIX" \ "QT.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" \ diff --git a/mkspecs/features/qt_module_fwdpri.prf b/mkspecs/features/qt_module_fwdpri.prf index 4c3a4b433f..33ceff1cd5 100644 --- a/mkspecs/features/qt_module_fwdpri.prf +++ b/mkspecs/features/qt_module_fwdpri.prf @@ -2,8 +2,6 @@ load(qt_build_paths) - isEmpty(MODULE_INSTALL_LIBS): MODULE_INSTALL_LIBS = $$[QT_INSTALL_LIBS/raw] - MODULE_FWD_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_lib_$${MODULE}.pri # -rpath-link is used by the linker to find depedencies of dynamic @@ -58,7 +56,6 @@ "QT_MODULE_PLUGIN_BASE = $$MODULE_BASE_OUTDIR/plugins" \ $$module_rpathlink \ $$module_rpathlink_priv \ - "QT.$${MODULE}.rpath = $$MODULE_INSTALL_LIBS" \ "include($$MODULE_PRI)" write_file($$MODULE_FWD_PRI, MODULE_FWD_PRI_CONT)|error("Aborting.") touch($$MODULE_FWD_PRI, $$MODULE_PRI) |