diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-15 15:47:29 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-16 22:44:15 +0000 |
| commit | 1e147f446a098bf17c27e744a22e535a9e21c061 (patch) | |
| tree | e20b79531047a5f7b7980f42b9741bec64fc32de /mkspecs | |
| parent | 5d31c9831da42ffb5f720b147d99be6d9eb93e30 (diff) | |
Add back osx compatibility check in QMAKE_PLATFORM.
If macx is present, osx AND macos should be required.
Change-Id: I5cd9d41270c741dc314720a1119b163dd17fdfd7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/spec_post.prf | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mkspecs/features/spec_post.prf b/mkspecs/features/spec_post.prf index a09462639f..234189fed1 100644 --- a/mkspecs/features/spec_post.prf +++ b/mkspecs/features/spec_post.prf @@ -33,9 +33,16 @@ isEmpty(QMAKE_PLATFORM) { error("Qmake spec sets an invalid TARGET_PLATFORM.") } -if(contains(QMAKE_PLATFORM, macx)|contains(QMAKE_PLATFORM, osx)):!contains(QMAKE_PLATFORM, macos) { - warning("qmake spec specifies platform macx or osx, but not macos.") - QMAKE_PLATFORM = macos $$QMAKE_PLATFORM +contains(QMAKE_PLATFORM, macx) { + !contains(QMAKE_PLATFORM, osx) { + warning("qmake spec specified platform macx, but not osx."); + QMAKE_PLATFORM = osx $$QMAKE_PLATFORM + } + + !contains(QMAKE_PLATFORM, macos) { + warning("qmake spec specifies platform macx, but not macos.") + QMAKE_PLATFORM = macos $$QMAKE_PLATFORM + } } CONFIG += $$QMAKE_PLATFORM |