diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-05 09:58:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-05 09:59:59 +0100 |
| commit | b36c5bdc30040b5100da2a003056d3519972e178 (patch) | |
| tree | 952e951bef0add6ee0ff0046c018d663568f9953 /mkspecs/features/mac/sdk.mk | |
| parent | 47869340b97686a4bf852f94edc3bae1e50d7053 (diff) | |
| parent | c9d18d4a9c9d1243a267316e2a702f9ba69de2fd (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12.0
Conflicts:
src/plugins/platforms/cocoa/qcocoaglcontext.mm
src/plugins/platforms/xcb/qxcbscreen.h
Change-Id: If9b4c67288396ff7346088ce591c7a3588b51979
Diffstat (limited to 'mkspecs/features/mac/sdk.mk')
| -rw-r--r-- | mkspecs/features/mac/sdk.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk index a7c8268da5..c0266f2139 100644 --- a/mkspecs/features/mac/sdk.mk +++ b/mkspecs/features/mac/sdk.mk @@ -1,4 +1,4 @@ -CURRENT_MAC_SDK_VERSION := $(shell /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version) +CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version) ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) |