diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-04 21:20:25 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-17 16:36:08 +0000 |
| commit | e853edd657d8f403d175a0e0c305ebf61a51f3ef (patch) | |
| tree | 9edf33d3627d0f477c0e266a3ce6393ea609a663 /mkspecs | |
| parent | 61fcbed4de0b497af6e2f4e4c7e09a3f2e0a7410 (diff) | |
simplify qt rpath code
the rpath applies only to the installed on-device location and is
consequently always the same for all modules, so there is no point in
indirections.
Change-Id: Ia0590552aa317d799a2d3879fd0c0768344b9645
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_pris.prf | 10 |
3 files changed, 5 insertions, 15 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 91f4fd460d..36ec32f982 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -59,6 +59,11 @@ qt_module_deps = $$QT $$QT_PRIVATE qt_module_deps = $$replace(qt_module_deps, -private$, _private) qt_module_deps = $$resolve_depends(qt_module_deps, "QT.") +!static:contains(QT_CONFIG, rpath):!contains(QT_CONFIG, static):!contains(QT_CONFIG, qt_framework):\ + contains(qt_module_deps, core) { + QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS/dev] +} + # static builds: link qml import plugins into the app. contains(qt_module_deps, qml): \ contains(QT_CONFIG, static):contains(TEMPLATE, .*app):!host_build:!no_import_scan { diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index a1c499610b..917822fbf0 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -127,11 +127,6 @@ defineTest(qtAddModule) { lib = $${MODULE_NAME}$${QT_LIBINFIX}$$qtPlatformTargetSuffix() LINKAGE += -l$$lib - contains(QT_CONFIG, rpath) { - QMAKE_RPATHDIR *= $$eval(QT.$${1}.rpath) - export(QMAKE_RPATHDIR) - } - contains(MODULE_CONFIG, staticlib) { PRE_TARGETDEPS *= $$MODULE_LIBS/$${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_STATICLIB} export(PRE_TARGETDEPS) diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf index 1d727847e2..cc6d48ac21 100644 --- a/mkspecs/features/qt_module_pris.prf +++ b/mkspecs/features/qt_module_pris.prf @@ -49,15 +49,6 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri module_libs = "\$\$QT_MODULE_HOST_LIB_BASE" else: \ module_libs = "\$\$QT_MODULE_LIB_BASE" - unix:!static { - host_build: \ - module_rpath = $$[QT_HOST_LIBS] - else: \ - module_rpath = $$[QT_INSTALL_LIBS/dev] - module_rpath = "QT.$${MODULE_ID}.rpath = $$val_escape(module_rpath)" - } else { - module_rpath = - } !isEmpty(QT_PRIVATE): \ module_rundep = "QT.$${MODULE_ID}.run_depends = $$replace(QT_PRIVATE, -private$, _private)" else: \ @@ -115,7 +106,6 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri "" \ "QT.$${MODULE_ID}.name = $$TARGET" \ "QT.$${MODULE_ID}.libs = $$module_libs" \ - $$module_rpath \ $$module_master \ "QT.$${MODULE_ID}.includes = $$MODULE_INCLUDES" !host_build: MODULE_PRI_CONT += \ |