cmake: Fix naming when referring to Apple macOS

Change-Id: Iafb5e448d0d65d42f788464fc600594a5666f9af
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

14 files changed, 16 insertions, 16 deletions

diff --git a/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt
index ba7d375e3b..bdee0f0f6c 100644
--- a/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt
@@ -7,6 +7,6 @@ add_subdirectory(tst)
 if(UNIX AND NOT ANDROID AND NOT APPLE)
     add_subdirectory(almostplugin)
 endif()
-if(APPLE_OSX AND QT_FEATURE_private_tests AND TARGET Qt::Gui)
+if(APPLE_MACOS AND QT_FEATURE_private_tests AND TARGET Qt::Gui)
     add_subdirectory(machtest)
 endif()
diff --git a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt
index 620ef96a5b..d75f39da58 100644
--- a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt
+++ b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt
@@ -15,7 +15,7 @@ add_qt_test(tst_qclipboard
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qclipboard CONDITION APPLE_OSX
+extend_target(tst_qclipboard CONDITION APPLE_MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
diff --git a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
index 620ef96a5b..d75f39da58 100644
--- a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
@@ -15,7 +15,7 @@ add_qt_test(tst_qclipboard
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qclipboard CONDITION APPLE_OSX
+extend_target(tst_qclipboard CONDITION APPLE_MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
diff --git a/tests/auto/network/kernel/CMakeLists.txt b/tests/auto/network/kernel/CMakeLists.txt
index c1082f60b7..49270d11cb 100644
--- a/tests/auto/network/kernel/CMakeLists.txt
+++ b/tests/auto/network/kernel/CMakeLists.txt
@@ -13,7 +13,7 @@ endif()
 if(QT_FEATURE_private_tests)
     add_subdirectory(qauthenticator)
 
-    if(NOT APPLE_OSX)
+    if(NOT APPLE_MACOS)
         add_subdirectory(qhostinfo)
     endif()
 endif()
diff --git a/tests/auto/other/CMakeLists.txt b/tests/auto/other/CMakeLists.txt
index e1d3c0e839..2ce438985f 100644
--- a/tests/auto/other/CMakeLists.txt
+++ b/tests/auto/other/CMakeLists.txt
@@ -15,7 +15,7 @@ if(TARGET Qt::Network AND TARGET Qt::Widgets AND NOT WINRT)
     add_subdirectory(lancelot)
     add_subdirectory(qnetworkaccessmanager_and_qprogressdialog)
 endif()
-if(APPLE_OSX AND TARGET Qt::Gui AND TARGET Qt::Widgets)
+if(APPLE_MACOS AND TARGET Qt::Gui AND TARGET Qt::Widgets)
     add_subdirectory(macgui)
     add_subdirectory(macplist)
     add_subdirectory(qaccessibilitymac)
@@ -35,7 +35,7 @@ endif()
 if(TARGET Qt::Network AND NOT WINRT)
     add_subdirectory(networkselftest)
 endif()
-if(APPLE_OSX AND TARGET Qt::Gui)
+if(APPLE_MACOS AND TARGET Qt::Gui)
     add_subdirectory(macnativeevents)
 endif()
 if(embedded)
diff --git a/tests/auto/other/macgui/.prev_CMakeLists.txt b/tests/auto/other/macgui/.prev_CMakeLists.txt
index 4923568a89..f0374b644e 100644
--- a/tests/auto/other/macgui/.prev_CMakeLists.txt
+++ b/tests/auto/other/macgui/.prev_CMakeLists.txt
@@ -26,7 +26,7 @@ add_qt_test(tst_macgui
 ## Scopes:
 #####################################################################
 
-extend_target(tst_macgui CONDITION APPLE_OSX
+extend_target(tst_macgui CONDITION APPLE_MACOS
     PUBLIC_LIBRARIES
         ${FWApplicationServices}
 )
diff --git a/tests/auto/other/macgui/CMakeLists.txt b/tests/auto/other/macgui/CMakeLists.txt
index de69c43765..a85b845536 100644
--- a/tests/auto/other/macgui/CMakeLists.txt
+++ b/tests/auto/other/macgui/CMakeLists.txt
@@ -26,7 +26,7 @@ add_qt_test(tst_macgui
 ## Scopes:
 #####################################################################
 
-extend_target(tst_macgui CONDITION APPLE_OSX
+extend_target(tst_macgui CONDITION APPLE_MACOS
     PUBLIC_LIBRARIES
         ${FWApplicationServices}
 )
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt
index 38c0547390..09dbc428ec 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt
@@ -23,5 +23,5 @@ add_qt_test(tst_qfilesystemmodel
 #### Keys ignored in scope 2:.:.:qfilesystemmodel.pro:WIN32:
 # testcase.timeout = "900"
 
-#### Keys ignored in scope 3:.:.:qfilesystemmodel.pro:APPLE_OSX:
+#### Keys ignored in scope 3:.:.:qfilesystemmodel.pro:APPLE_MACOS:
 # testcase.timeout = "900"
diff --git a/tests/auto/widgets/styles/CMakeLists.txt b/tests/auto/widgets/styles/CMakeLists.txt
index 4fc260fe39..73bbbeb4ee 100644
--- a/tests/auto/widgets/styles/CMakeLists.txt
+++ b/tests/auto/widgets/styles/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Generated from styles.pro.
 
-if (APPLE_OSX)
+if (APPLE_MACOS)
     add_subdirectory(qmacstyle)
 endif()
 add_subdirectory(qstyle)
diff --git a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
index f95094aa7d..7be44863c6 100644
--- a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
@@ -19,7 +19,7 @@ add_qt_test(tst_qlineedit
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qlineedit CONDITION APPLE_OSX
+extend_target(tst_qlineedit CONDITION APPLE_MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
diff --git a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt
index a20fe70492..711d360993 100644
--- a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt
@@ -17,14 +17,14 @@ add_qt_test(tst_qmenu
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmenu CONDITION APPLE_OSX
+extend_target(tst_qmenu CONDITION APPLE_MACOS
     SOURCES
         tst_qmenu_mac.mm
     PUBLIC_LIBRARIES
         objc
 )
 
-extend_target(tst_qmenu CONDITION NOT APPLE_OSX
+extend_target(tst_qmenu CONDITION NOT APPLE_MACOS
     DEFINES
         QTEST_QPA_MOUSE_HANDLING
 )
diff --git a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
index 43875cd113..0bfb6ac12d 100644
--- a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
@@ -16,7 +16,7 @@ add_qt_test(tst_qmenubar
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmenubar CONDITION APPLE_OSX
+extend_target(tst_qmenubar CONDITION APPLE_MACOS
     SOURCES
         tst_qmenubar_mac.mm
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
index 4106de04de..6e3ffec498 100644
--- a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
@@ -19,7 +19,7 @@ add_qt_test(tst_qplaintextedit
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qplaintextedit CONDITION APPLE_OSX
+extend_target(tst_qplaintextedit CONDITION APPLE_MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
diff --git a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
index 61641707b9..4a67320a31 100644
--- a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
@@ -22,7 +22,7 @@ add_qt_test(tst_qtextedit
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qtextedit CONDITION APPLE_OSX
+extend_target(tst_qtextedit CONDITION APPLE_MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )