diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-07 14:43:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-13 16:05:50 +0100 |
| commit | c3637ce66b240e0ca39efc9e97b4605edd4ec7ef (patch) | |
| tree | 3e7e690dd9d00869e23cafa9ae06057e284cf51f /mkspecs/features/qt_functions.prf | |
| parent | f3597af5adcd2275503e9e4bfb425549f9ab3ced (diff) | |
define the module rpath in the installed module pri file
the fallback path wouldn't account for a sysroot. as there is no clean
way to implement that, rather remove the fallback alltogether and make
the rpath a mandatory part of modules.
Change-Id: I6f2bd6e36889be2f61e17a579174380aa3c6622d
Reviewed-by: Romain Pokrzywka <romain.pokrzywka@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 6 |
1 files changed, 1 insertions, 5 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 |