summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-09-29 20:35:10 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-10-20 17:18:29 +0000
commit8e846b337bb5e755d38aef3ebc8123ed1c9bd696 (patch)
tree2a608c068f1026b62dc24ccc125ff0c17cd0a72d
parent2d8801a9622ca47e377dfb7e1cb73f1809c764ed (diff)
downloadqtbase-8e846b337bb5e755d38aef3ebc8123ed1c9bd696.tar.gz
don't try to use relative rpaths on platforms that don't support it
Change-Id: I8224d429d71ccc829beb1addf592806d2edaa87b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--mkspecs/features/qt.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index d200467571..d0d6bb27ce 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -155,7 +155,7 @@ 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:contains(INSTALLS, target):\
+ relative_qt_rpath:!isEmpty(QMAKE_LFLAGS_REL_RPATH):contains(INSTALLS, target):\
isEmpty(target.files):isEmpty(target.commands):isEmpty(target.extra) {
mac {
if(equals(TEMPLATE, app):app_bundle)|\