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/features/qt_functions.prf | |
| 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/features/qt_functions.prf')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 5 |
1 files changed, 0 insertions, 5 deletions
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) |