diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-14 13:14:13 +0200 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-10-16 00:12:11 +0000 |
| commit | 418494ecb6da1421a88dd9893efc2b9a20ca79d7 (patch) | |
| tree | 1e9f164ac04dea5cd483db33c9f150b870676323 /mkspecs/features/uikit | |
| parent | 4e945ea2f8e0e1e8eb512e3d590da12661a674cd (diff) | |
fix QMAKE_DEFAULT_*DIRS resolution with apple SDK, take 2
the code got factored out to an own toolchain.prf file, which is
load()ed from default_pre.prf, so no change at first.
however, on mac, we shadow toolchain.prf, and make it load() sdk.prf
first.
a side effect, it has become harder to disable the use of an sdk
altogether: putting CONFIG-=sdk into a project file or the qmake
command line has no effect now. instead, it's possible to put it into
.qmake.{conf,cache}.
to make it simpler again, it's conceivable to finally add qmake -pre,
which would allow setting variables before default_pre.prf is executed.
take 2: there was nothing wrong with the original patch, but in 5.8,
CONFIG+=simulator_and_device moved from qconfig.pri to various prf files
that would do it according to the simulator_and_device configure
feature, which would be way too late for the "pulled ahead" sdk.prf
loading. as simulator_and_device is now gone entirely, it is safe to
re-apply this patch (mostly) as-is.
Task-number: QTBUG-56144
Change-Id: I6cf484982eaed8af39f7a539c60f5a087a299914
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'mkspecs/features/uikit')
| -rw-r--r-- | mkspecs/features/uikit/default_pre.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/uikit/default_pre.prf b/mkspecs/features/uikit/default_pre.prf index 8b5b3ccfe9..b6974388ce 100644 --- a/mkspecs/features/uikit/default_pre.prf +++ b/mkspecs/features/uikit/default_pre.prf @@ -1,6 +1,4 @@ -load(default_pre) - !isEmpty(QT_VERSION) { qtConfig(simulator_and_device)|contains(QMAKE_MAC_SDK, ^$${device.sdk}.*): \ CONFIG += device $${device.sdk} @@ -17,6 +15,8 @@ load(default_pre) } } +load(default_pre) + # Check for supported Xcode versions lessThan(QMAKE_XCODE_VERSION, "4.3"): \ error("This mkspec requires Xcode 4.3 or later") |