1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add back osx compatibility check in QMAKE_PLATFORM.

Browse Source 
If macx is present, osx AND macos should be required.

Change-Id: I5cd9d41270c741dc314720a1119b163dd17fdfd7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Jake Petroules 2016-06-15 15:47:29 -07:00
parent 5d31c9831d
commit 1e147f446a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mkspecs/features/spec_post.prf
View File

@ -33,9 +33,16 @@ isEmpty(QMAKE_PLATFORM) {
error("Qmake spec sets an invalid TARGET_PLATFORM.") error("Qmake spec sets an invalid TARGET_PLATFORM.")
} }
if(contains(QMAKE_PLATFORM, macx)|contains(QMAKE_PLATFORM, osx)):!contains(QMAKE_PLATFORM, macos) { contains(QMAKE_PLATFORM, macx) {
warning("qmake spec specifies platform macx or osx, but not macos.") !contains(QMAKE_PLATFORM, osx) {
QMAKE_PLATFORM = macos $$QMAKE_PLATFORM 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 CONFIG += $$QMAKE_PLATFORM