diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-06-28 18:01:37 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-07-02 15:38:32 +0000 |
| commit | 23e2cc38ffcc725e8b5a4ac76941c278af86e388 (patch) | |
| tree | 02dff6a03d2d14b48dc936f029f99f367cf19417 | |
| parent | afdc4f439c82cfa70f6fb6a66c816ba540226f43 (diff) | |
fix QMAKE_DEFAULT_INCDIRS detection with Xcode targeting uikit platforms
uikit/sdk.prf replaces QMAKE_MAC_SDK_PATH with a make expansion of that
variable, which of course does not work when we use the contents
directly.
amends 6d5489f5d.
Task-number: QTBUG-61690
Change-Id: Id77dff8ee7d737dd35f74cc7d39faaa50b4b1ab9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | mkspecs/features/toolchain.prf | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf index a7c9172133..eb7b1385f2 100644 --- a/mkspecs/features/toolchain.prf +++ b/mkspecs/features/toolchain.prf @@ -40,7 +40,12 @@ isEmpty($${target_prefix}.INCDIRS) { # While technically incorrect but without any likely practical effect, # UIKit simulator platforms will see the device SDK's sysroot in # QMAKE_DEFAULT_*DIRS, because they're handled in a single build pass. - darwin: cxx_flags += -isysroot $$QMAKE_MAC_SDK_PATH + darwin { + uikit:macx-xcode: \ + cxx_flags += -isysroot $$sdk_path_device.value + else: \ + cxx_flags += -isysroot $$QMAKE_MAC_SDK_PATH + } rim_qcc: \ # Need the cc1plus and ld command lines to pick up the paths |