From 1e147f446a098bf17c27e744a22e535a9e21c061 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Wed, 15 Jun 2016 15:47:29 -0700 Subject: 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 --- mkspecs/features/spec_post.prf | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'mkspecs') 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 -- cgit v1.2.3