diff options
Diffstat (limited to 'mkspecs/features/qt.prf')
| -rw-r--r-- | mkspecs/features/qt.prf | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 2e466ec9be..d416a8955a 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -119,12 +119,6 @@ for(ever) { !mac|!contains(MODULE_CONFIG, lib_bundle): \ MODULE_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION, - win32 { - # Make sure the version number isn't appended again to the lib name - QMAKE_$${upper($$MODULE_NAME$$QT_LIBINFIX)}_VERSION_OVERRIDE = 0 - QMAKE_$${upper($$MODULE_NAME$$QT_LIBINFIX)}D_VERSION_OVERRIDE = 0 - } - isEmpty(LINKAGE) { !isEmpty(MODULE_LIBS_ADD): \ LINKAGE = -L$$MODULE_LIBS_ADD @@ -161,7 +155,8 @@ qt_module_deps = $$resolve_depends(qt_module_deps, "QT.") !no_qt_rpath:!static:contains(QT_CONFIG, rpath):!contains(QT_CONFIG, static):\ contains(qt_module_deps, core) { - relative_qt_rpath:defined(target.path, var) { + relative_qt_rpath:contains(INSTALLS, target):\ + isEmpty(target.files):isEmpty(target.commands):isEmpty(target.extra) { mac { if(equals(TEMPLATE, app):app_bundle)|\ if(equals(TEMPLATE, lib):plugin:plugin_bundle) { @@ -172,11 +167,17 @@ qt_module_deps = $$resolve_depends(qt_module_deps, "QT.") } else { binpath = $$target.path } - QMAKE_RPATHDIR += @loader_path/$$relative_path($$[QT_INSTALL_LIBS], $$binpath) + rpath = @loader_path } else { QMAKE_LFLAGS += -Wl,-z,origin - QMAKE_RPATHDIR += $ORIGIN/$$relative_path($$[QT_INSTALL_LIBS], $$target.path) + binpath = $$target.path + rpath = $ORIGIN } + # NOT the /dev property, as INSTALLS use host paths + relpath = $$relative_path($$[QT_INSTALL_LIBS], $$binpath) + !equals(relpath, .): \ + rpath = $$rpath/$$relpath + QMAKE_RPATHDIR += $$rpath } else { QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS/dev] } |