From a7965a13aa56d653d8d93085ac7e70cf230bfb43 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Thu, 19 Nov 2015 16:53:50 +0100
Subject: remove redundant "mac" checks

qt_framework and {app,lib}_bundle imply darwin, so there is no point in
testing for it.

Change-Id: I9fe48c26c8e271a5575b17e92df8674d3c3a3204
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 mkspecs/features/qt.prf           | 4 ++--
 mkspecs/features/qt_functions.prf | 2 +-
 mkspecs/features/qt_module.prf    | 2 +-
 mkspecs/features/testcase.prf     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'mkspecs/features')

diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index dfff6cc091..c3448718b9 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -89,7 +89,7 @@ for(ever) {
         MODULE_LIBS_ADD -= $$QMAKE_DEFAULT_LIBDIRS
 
         LINKAGE =
-        mac:contains(MODULE_CONFIG, lib_bundle) {
+        contains(MODULE_CONFIG, lib_bundle) {
             FRAMEWORK_INCLUDE = $${MODULE_LIBS}/$${MODULE_NAME}.framework/Headers
             !qt_no_framework_direct_includes {
                 INCLUDEPATH *= $$FRAMEWORK_INCLUDE
@@ -111,7 +111,7 @@ for(ever) {
 
             # Re-insert the major version in the library name (cf qt5LibraryTarget above)
             # unless it's a framework build
-            !mac|!contains(MODULE_CONFIG, lib_bundle): \
+            !contains(MODULE_CONFIG, lib_bundle): \
                 MODULE_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION,
 
             isEmpty(LINKAGE) {
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 6616aa4230..403b847ac1 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -15,7 +15,7 @@ defineReplace(qtPlatformTargetSuffix) {
 
 defineReplace(qtLibraryTarget) {
    LIBRARY_NAME = $$1
-   mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
+   CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
       QMAKE_FRAMEWORK_BUNDLE_NAME = $$LIBRARY_NAME
       export(QMAKE_FRAMEWORK_BUNDLE_NAME)
    }
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 0972e7f3c4..e2e56c318f 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -42,7 +42,7 @@ host_build {
     }
 }
 
-mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \
+CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \
     CONFIG += lib_bundle
 
 CONFIG += relative_qt_rpath  # Qt libraries should be relocatable
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf
index a6ef930128..6f6f073f70 100644
--- a/mkspecs/features/testcase.prf
+++ b/mkspecs/features/testcase.prf
@@ -27,7 +27,7 @@ check.commands += $(TESTRUNNER)
 unix {
     isEmpty(TEST_TARGET_DIR): TEST_TARGET_DIR = .
 
-    mac:app_bundle: \
+    app_bundle: \
         check.commands += $${TEST_TARGET_DIR}/$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET)
     else: \
         check.commands += $${TEST_TARGET_DIR}/$(QMAKE_TARGET)
-- 
cgit v1.2.3