diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-05-28 02:13:34 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-08-31 22:41:58 +0000 |
| commit | f777b1ae4882450dc6d7fa04159b776b18e5a7b0 (patch) | |
| tree | a4df0663c2164f9385289bad36c7a6f84ae50e95 /mkspecs | |
| parent | f510a51dace0cb39a93b057b8fcbcbdda33a956e (diff) | |
Provide better QMAKE_RPATHDIR defaults on Apple platforms
Now QMAKE_RPATHDIR also includes @executable_path and @loader_path
on Apple platforms, and omits any others on iOS, tvOS, and watchOS
since they can't use paths outside the application bundle.
Change-Id: Ia8f76ebcddd51f44eca482a51ce1710369c8df10
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/uikit.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/mac/default_post.prf | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mkspecs/common/uikit.conf b/mkspecs/common/uikit.conf index 6ffbe51fce..daedaa46cd 100644 --- a/mkspecs/common/uikit.conf +++ b/mkspecs/common/uikit.conf @@ -3,7 +3,7 @@ # QMAKE_PLATFORM += uikit -CONFIG += bitcode reduce_exports shallow_bundle +CONFIG += bitcode reduce_exports shallow_bundle no_qt_rpath INCLUDEPATH += $$PWD/uikit DEFINES += DARWIN_NO_CARBON QT_NO_PRINTER QT_NO_PRINTDIALOG diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index 7bf6b4a716..24a631b7bd 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -24,6 +24,13 @@ qt { } } +# Add the same default rpaths as Xcode does for new projects. +# This is especially important for iOS/tvOS/watchOS where no other option is possible. +!no_default_rpath { + QMAKE_RPATHDIR += @executable_path/Frameworks + equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks +} + macx-xcode:!isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { debug_information_format.name = DEBUG_INFORMATION_FORMAT debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT |