Fix platform conditions across entire modulev5.9.0-alpha1

Change-Id: Id63420244eecd5935b7fa7c82b6ad9e0e48ad0f1
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>

8 files changed, 46 insertions, 42 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index f23b00b..37692d4 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-mac:SUBDIRS = macextras
+SUBDIRS = macextras
diff --git a/examples/macextras/macextras.pro b/examples/macextras/macextras.pro
index a9c135d..8d2190d 100644
--- a/examples/macextras/macextras.pro
+++ b/examples/macextras/macextras.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-mac:SUBDIRS = macfunctions
-mac:!ios:SUBDIRS += embeddedqwindow \
+SUBDIRS = macfunctions
+macos: SUBDIRS += embeddedqwindow \
           macpasteboardmime \
           mactoolbar
diff --git a/qtmacextras.pro b/qtmacextras.pro
index 58c33f2..78cfe59 100644
--- a/qtmacextras.pro
+++ b/qtmacextras.pro
@@ -1 +1,2 @@
+requires(darwin)
 load(qt_parts)
diff --git a/src/macextras/macextras-lib.pri b/src/macextras/macextras-lib.pri
index 2ce4f05..eac6ad9 100644
--- a/src/macextras/macextras-lib.pri
+++ b/src/macextras/macextras-lib.pri
@@ -1,41 +1,41 @@
 INCLUDEPATH += $$PWD
 
-mac {
+PUBLIC_HEADERS += \
+    $$PWD/qmacfunctions.h \
+
+PRIVATE_HEADERS += $$PWD/qmacfunctions_p.h
+OBJECTIVE_SOURCES += $$PWD/qmacfunctions.mm
+
+uikit:!watchos {
+    OBJECTIVE_SOURCES += \
+        $$PWD/qmacfunctions_ios.mm
+
+    LIBS_PRIVATE += -framework UIKit
+}
+
+macos {
     PUBLIC_HEADERS += \
-        $$PWD/qmacfunctions.h \
-
-    PRIVATE_HEADERS += $$PWD/qmacfunctions_p.h
-    OBJECTIVE_SOURCES += $$PWD/qmacfunctions.mm
-
-    ios {
-        OBJECTIVE_SOURCES += \
-            $$PWD/qmacfunctions_ios.mm
-
-        LIBS_PRIVATE += -framework UIKit
-    } else {
-        PUBLIC_HEADERS += \
-        $$PWD/qmactoolbar.h \
-        $$PWD/qmactoolbaritem.h \
-
-        PRIVATE_HEADERS += \
-            $$PWD/qmactoolbar_p.h \
-            $$PWD/qmactoolbardelegate_p.h \
-            $$PWD/qnstoolbar_p.h
-
-        OBJECTIVE_SOURCES += \
-            $$PWD/qmacfunctions_mac.mm \
-            $$PWD/qmactoolbar.mm \
-            $$PWD/qmactoolbaritem.mm \
-            $$PWD/qmactoolbardelegate.mm \
-            $$PWD/qnstoolbar.mm
-
-        greaterThan(QT_MAJOR_VERSION, 4) {
-            PUBLIC_HEADERS += $$PWD/qmacpasteboardmime.h
-            OBJECTIVE_SOURCES += $$PWD/qmacpasteboardmime.mm
-        }
-
-        LIBS_PRIVATE += -framework AppKit
+    $$PWD/qmactoolbar.h \
+    $$PWD/qmactoolbaritem.h \
+
+    PRIVATE_HEADERS += \
+        $$PWD/qmactoolbar_p.h \
+        $$PWD/qmactoolbardelegate_p.h \
+        $$PWD/qnstoolbar_p.h
+
+    OBJECTIVE_SOURCES += \
+        $$PWD/qmacfunctions_mac.mm \
+        $$PWD/qmactoolbar.mm \
+        $$PWD/qmactoolbaritem.mm \
+        $$PWD/qmactoolbardelegate.mm \
+        $$PWD/qnstoolbar.mm
+
+    greaterThan(QT_MAJOR_VERSION, 4) {
+        PUBLIC_HEADERS += $$PWD/qmacpasteboardmime.h
+        OBJECTIVE_SOURCES += $$PWD/qmacpasteboardmime.mm
     }
+
+    LIBS_PRIVATE += -framework AppKit
 }
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
diff --git a/src/macextras/qmacfunctions.h b/src/macextras/qmacfunctions.h
index 6d52cf5..ccdbd6e 100644
--- a/src/macextras/qmacfunctions.h
+++ b/src/macextras/qmacfunctions.h
@@ -85,10 +85,10 @@ Q_MACEXTRAS_EXPORT bool isMainWindow(QWindow *window);
 #endif
 #endif // Q_OS_OSX
 
-#ifdef Q_OS_IOS
+#if defined(QT_PLATFORM_UIKIT) && !defined(Q_OS_WATCHOS)
 Q_MACEXTRAS_EXPORT void setApplicationIconBadgeNumber(int number) __attribute__((availability(ios_app_extension,unavailable)));
 Q_MACEXTRAS_EXPORT int applicationIconBadgeNumber() __attribute__((availability(ios_app_extension,unavailable)));
-#endif // Q_OS_IOS
+#endif // defined(QT_PLATFORM_UIKIT) && !defined(Q_OS_WATCHOS)
 }
 
 QT_END_NAMESPACE
diff --git a/tests/auto/macfunctions/macfunctions.pro b/tests/auto/macfunctions/macfunctions.pro
index b13227a..9a605d9 100644
--- a/tests/auto/macfunctions/macfunctions.pro
+++ b/tests/auto/macfunctions/macfunctions.pro
@@ -3,4 +3,4 @@ CONFIG -= app_bundle
 TARGET = tst_qmacfunctions
 QT += macextras widgets testlib
 OBJECTIVE_SOURCES += tst_qmacfunctions.mm
-LIBS += -framework AppKit
+macos: LIBS += -framework AppKit
diff --git a/tests/auto/macfunctions/tst_qmacfunctions.mm b/tests/auto/macfunctions/tst_qmacfunctions.mm
index e8e04a7..cd1d304 100644
--- a/tests/auto/macfunctions/tst_qmacfunctions.mm
+++ b/tests/auto/macfunctions/tst_qmacfunctions.mm
@@ -25,7 +25,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#import <AppKit/AppKit.h>
 
 #include <QString>
 #include <QtTest>
@@ -35,6 +34,10 @@
 #include <QtWidgets/QMainWindow>
 #include <qmacfunctions.h>
 
+#ifdef Q_OS_MACOS
+#import <AppKit/AppKit.h>
+#endif
+
 class tst_QMacFunctions : public QObject
 {
     Q_OBJECT
diff --git a/tests/tests.pro b/tests/tests.pro
index 77383dc..7fbc8a9 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-macx:!ios:SUBDIRS = auto
+SUBDIRS = auto