From 77885f8402ad65e00e01c5e15777edcedf9741b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Mon, 16 Mar 2020 13:36:47 +0100
Subject: cmake: Remove APPLE prefix from platform names

None of the other platforms have it.

Change-Id: Ib448c2c03ba03f711b507ef391977c0e6aa7c192
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/platformsupport/CMakeLists.txt                     | 2 +-
 src/platformsupport/clipboard/CMakeLists.txt           | 2 +-
 src/platformsupport/fontdatabases/.prev_CMakeLists.txt | 4 ++--
 src/platformsupport/fontdatabases/CMakeLists.txt       | 4 ++--
 src/platformsupport/themes/CMakeLists.txt              | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/platformsupport')

diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt
index fc980f3707..9e91754ac8 100644
--- a/src/platformsupport/CMakeLists.txt
+++ b/src/platformsupport/CMakeLists.txt
@@ -16,7 +16,7 @@ endif()
 if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib)
     add_subdirectory(input)
 endif()
-if(QT_FEATURE_xcb OR (UNIX AND NOT APPLE_UIKIT))
+if(QT_FEATURE_xcb OR (UNIX AND NOT UIKIT))
     add_subdirectory(services)
 endif()
 if(QT_FEATURE_opengl)
diff --git a/src/platformsupport/clipboard/CMakeLists.txt b/src/platformsupport/clipboard/CMakeLists.txt
index 5a54d67d28..d5b6835a54 100644
--- a/src/platformsupport/clipboard/CMakeLists.txt
+++ b/src/platformsupport/clipboard/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_add_module(ClipboardSupport
 ## Scopes:
 #####################################################################
 
-qt_extend_target(ClipboardSupport CONDITION APPLE_MACOS
+qt_extend_target(ClipboardSupport CONDITION MACOS
     LIBRARIES
         ${FWAppKit}
 )
diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
index 5559b7de5e..b30b04824a 100644
--- a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
+++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
@@ -33,12 +33,12 @@ qt_extend_target(FontDatabaseSupport CONDITION APPLE
         ${FWFoundation}
 )
 
-qt_extend_target(FontDatabaseSupport CONDITION APPLE_MACOS
+qt_extend_target(FontDatabaseSupport CONDITION MACOS
     LIBRARIES
         ${FWAppKit}
 )
 
-qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_MACOS
+qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT MACOS
     LIBRARIES
         ${FWUIKit}
 )
diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt
index a7824d7275..46919116da 100644
--- a/src/platformsupport/fontdatabases/CMakeLists.txt
+++ b/src/platformsupport/fontdatabases/CMakeLists.txt
@@ -36,12 +36,12 @@ qt_extend_target(FontDatabaseSupport CONDITION APPLE
         ${FWFoundation}
 )
 
-qt_extend_target(FontDatabaseSupport CONDITION APPLE_MACOS
+qt_extend_target(FontDatabaseSupport CONDITION MACOS
     LIBRARIES
         ${FWAppKit}
 )
 
-qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_MACOS
+qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT MACOS
     LIBRARIES
         ${FWUIKit}
 )
diff --git a/src/platformsupport/themes/CMakeLists.txt b/src/platformsupport/themes/CMakeLists.txt
index a7be78d0e0..3b1ad022b8 100644
--- a/src/platformsupport/themes/CMakeLists.txt
+++ b/src/platformsupport/themes/CMakeLists.txt
@@ -22,12 +22,12 @@ qt_add_module(ThemeSupport
 ## Scopes:
 #####################################################################
 
-qt_extend_target(ThemeSupport CONDITION QT_FEATURE_xcb OR (UNIX AND NOT APPLE_UIKIT)
+qt_extend_target(ThemeSupport CONDITION QT_FEATURE_xcb OR (UNIX AND NOT UIKIT)
     SOURCES
         genericunix/qgenericunixthemes.cpp genericunix/qgenericunixthemes_p.h
 )
 
-qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT APPLE_UIKIT)
+qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT UIKIT)
     SOURCES
         genericunix/dbusmenu/qdbusmenuadaptor.cpp genericunix/dbusmenu/qdbusmenuadaptor_p.h
         genericunix/dbusmenu/qdbusmenubar.cpp genericunix/dbusmenu/qdbusmenubar_p.h
@@ -41,7 +41,7 @@ qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND (QT_FEATURE_xcb OR U
         Qt::DBus
 )
 
-qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND QT_FEATURE_systemtrayicon AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT APPLE_UIKIT)
+qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND QT_FEATURE_systemtrayicon AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT UIKIT)
     SOURCES
         genericunix/dbustray/qdbustrayicon.cpp genericunix/dbustray/qdbustrayicon_p.h
         genericunix/dbustray/qdbustraytypes.cpp genericunix/dbustray/qdbustraytypes_p.h
-- 
cgit v1.2.3