CMake: Update Apple platform defines after rename in qtbase

Change-Id: Ia0a075e3199eab735f9b289873beeb8730ebc47e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
author: Tor Arne Vestbø <torarnv@gmail.com> 2020-03-16 14:10:44 +0100
committer: Tor Arne Vestbø <torarnv@gmail.com> 2020-03-17 10:42:00 +0100
commit: a5df29201fb795503635ddaae787ade5b96bff5e (patch)
tree: 340a4d8021ce04a58e7252a03c33b6732caee942 /tests/auto
parent: db554e8e1c3242634d035ebb3dcbe3c441d80bdc (diff)
166 files changed, 332 insertions, 332 deletions
diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt
index 956a863283..c52566a954 100644
--- a/tests/auto/.prev_CMakeLists.txt
+++ b/tests/auto/.prev_CMakeLists.txt
@@ -7,7 +7,7 @@ add_subdirectory(qmldevtools)
 add_subdirectory(cmake)
 add_subdirectory(installed_cmake)
 add_subdirectory(toolsupport)
-if(NOT APPLE_UIKIT)
+if(NOT UIKIT)
     add_subdirectory(qmltest)
 endif()
 if(TARGET Qt::Gui AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3))
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 702f646bd4..eb1c2d34df 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -9,7 +9,7 @@ add_subdirectory(qmldevtools)
 # add_subdirectory(installed_cmake)
 # special case end
 add_subdirectory(toolsupport)
-if(NOT APPLE_UIKIT)
+if(NOT UIKIT)
     add_subdirectory(qmltest)
 endif()
 if(TARGET Qt::Gui AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3))
diff --git a/tests/auto/particles/qquickage/CMakeLists.txt b/tests/auto/particles/qquickage/CMakeLists.txt
index e50a9a78e1..ef76c37e1e 100644
--- a/tests/auto/particles/qquickage/CMakeLists.txt
+++ b/tests/auto/particles/qquickage/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickage
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickage CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickage CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickangleddirection/CMakeLists.txt b/tests/auto/particles/qquickangleddirection/CMakeLists.txt
index 48aeb9e1ab..7d8d98c948 100644
--- a/tests/auto/particles/qquickangleddirection/CMakeLists.txt
+++ b/tests/auto/particles/qquickangleddirection/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickangleddirection
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickangleddirection CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickangleddirection CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickangleddirection CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickangleddirection CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt
index cce3fd96f4..49e4eabcbc 100644
--- a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt
+++ b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickcumulativedirection
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickcumulativedirection CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickcumulativedirection CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickcumulativedirection CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickcumulativedirection CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt
index cebe7f8664..bf65a1056f 100644
--- a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt
+++ b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickcustomaffector
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickcustomaffector CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickcustomaffector CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickcustomaffector CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickcustomaffector CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickcustomparticle/CMakeLists.txt b/tests/auto/particles/qquickcustomparticle/CMakeLists.txt
index 5dd5b4b7cb..c4760a9475 100644
--- a/tests/auto/particles/qquickcustomparticle/CMakeLists.txt
+++ b/tests/auto/particles/qquickcustomparticle/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickcustomparticle
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickcustomparticle CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickcustomparticle CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickcustomparticle CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickcustomparticle CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt
index 396ca53047..6b56fe027a 100644
--- a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt
+++ b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickellipseextruder
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickellipseextruder CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickellipseextruder CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickellipseextruder CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickellipseextruder CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickfriction/CMakeLists.txt b/tests/auto/particles/qquickfriction/CMakeLists.txt
index 5b2a46cc0d..b72caa7e24 100644
--- a/tests/auto/particles/qquickfriction/CMakeLists.txt
+++ b/tests/auto/particles/qquickfriction/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickfriction
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickfriction CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickfriction CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickfriction CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickfriction CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickgravity/CMakeLists.txt b/tests/auto/particles/qquickgravity/CMakeLists.txt
index 82fb41fc44..3c5c294a95 100644
--- a/tests/auto/particles/qquickgravity/CMakeLists.txt
+++ b/tests/auto/particles/qquickgravity/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickgravity
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickgravity CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickgravity CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickgravity CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickgravity CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt
index b72b7e617b..6c8ed8d0d4 100644
--- a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt
+++ b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickgroupgoal
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickgroupgoal CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickgroupgoal CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickgroupgoal CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickgroupgoal CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickimageparticle/CMakeLists.txt b/tests/auto/particles/qquickimageparticle/CMakeLists.txt
index 5f7864cd04..819ea52b6e 100644
--- a/tests/auto/particles/qquickimageparticle/CMakeLists.txt
+++ b/tests/auto/particles/qquickimageparticle/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickimageparticle
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickimageparticle CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickimageparticle CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickimageparticle CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickimageparticle CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickitemparticle/CMakeLists.txt b/tests/auto/particles/qquickitemparticle/CMakeLists.txt
index a896c13702..e13dfc8b3f 100644
--- a/tests/auto/particles/qquickitemparticle/CMakeLists.txt
+++ b/tests/auto/particles/qquickitemparticle/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickitemparticle
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickitemparticle CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickitemparticle CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickitemparticle CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickitemparticle CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquicklineextruder/CMakeLists.txt b/tests/auto/particles/qquicklineextruder/CMakeLists.txt
index a845075438..b6dc214949 100644
--- a/tests/auto/particles/qquicklineextruder/CMakeLists.txt
+++ b/tests/auto/particles/qquicklineextruder/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquicklineextruder
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquicklineextruder CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicklineextruder CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquicklineextruder CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicklineextruder CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt
index 1102f3a03f..f85092317e 100644
--- a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt
+++ b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickmaskextruder
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickmaskextruder CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickmaskextruder CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickmaskextruder CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickmaskextruder CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt
index 0e02d90d79..ca5664bc4c 100644
--- a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt
+++ b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickparticlegroup
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickparticlegroup CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickparticlegroup CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickparticlegroup CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickparticlegroup CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt
index 2a6c50f08d..20dd7d4ec8 100644
--- a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt
+++ b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickparticlesystem
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickparticlesystem CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickparticlesystem CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickparticlesystem CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickparticlesystem CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickpointattractor/CMakeLists.txt b/tests/auto/particles/qquickpointattractor/CMakeLists.txt
index 2fe3a17596..6f01e7df7e 100644
--- a/tests/auto/particles/qquickpointattractor/CMakeLists.txt
+++ b/tests/auto/particles/qquickpointattractor/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickpointattractor
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickpointattractor CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpointattractor CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickpointattractor CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpointattractor CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickpointdirection/CMakeLists.txt b/tests/auto/particles/qquickpointdirection/CMakeLists.txt
index bda38034e0..ee66e0af9f 100644
--- a/tests/auto/particles/qquickpointdirection/CMakeLists.txt
+++ b/tests/auto/particles/qquickpointdirection/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickpointdirection
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickpointdirection CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpointdirection CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickpointdirection CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpointdirection CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt
index a285540410..991fa0069a 100644
--- a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt
+++ b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickrectangleextruder
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickrectangleextruder CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickrectangleextruder CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickrectangleextruder CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickrectangleextruder CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickspritegoal/CMakeLists.txt b/tests/auto/particles/qquickspritegoal/CMakeLists.txt
index 95be9dad08..9e7ee863c9 100644
--- a/tests/auto/particles/qquickspritegoal/CMakeLists.txt
+++ b/tests/auto/particles/qquickspritegoal/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickspritegoal
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickspritegoal CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickspritegoal CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickspritegoal CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickspritegoal CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt
index 0b95e975d2..d7cdb68677 100644
--- a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt
+++ b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquicktargetdirection
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquicktargetdirection CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktargetdirection CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquicktargetdirection CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktargetdirection CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt
index ac9f4c8423..b4852f40eb 100644
--- a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt
+++ b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquicktrailemitter
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquicktrailemitter CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktrailemitter CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquicktrailemitter CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktrailemitter CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickturbulence/CMakeLists.txt b/tests/auto/particles/qquickturbulence/CMakeLists.txt
index c98be1e304..c5ae3db05c 100644
--- a/tests/auto/particles/qquickturbulence/CMakeLists.txt
+++ b/tests/auto/particles/qquickturbulence/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickturbulence
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickturbulence CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickturbulence CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickturbulence CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickturbulence CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/particles/qquickwander/CMakeLists.txt b/tests/auto/particles/qquickwander/CMakeLists.txt
index c4e44cb7f1..b6e2f95bc6 100644
--- a/tests/auto/particles/qquickwander/CMakeLists.txt
+++ b/tests/auto/particles/qquickwander/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickwander
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickwander CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickwander CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickwander CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickwander CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/bindingdependencyapi/CMakeLists.txt b/tests/auto/qml/bindingdependencyapi/CMakeLists.txt
index 1aa7378875..60e58bb08f 100644
--- a/tests/auto/qml/bindingdependencyapi/CMakeLists.txt
+++ b/tests/auto/qml/bindingdependencyapi/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_bindingdependencyapi
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_bindingdependencyapi CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_bindingdependencyapi CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_bindingdependencyapi CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_bindingdependencyapi CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
index b75f143faa..bc1d98bfb9 100644
--- a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
@@ -34,12 +34,12 @@ qt_add_test(tst_qdebugmessageservice
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qdebugmessageservice CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qdebugmessageservice CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qdebugmessageservice CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qdebugmessageservice CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
index 4650f9074d..390cc30d0f 100644
--- a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
@@ -24,12 +24,12 @@ qt_add_test(tst_qpacketprotocol
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qpacketprotocol CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qpacketprotocol CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qpacketprotocol CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qpacketprotocol CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
index e727640a9d..dfdaadb869 100644
--- a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qqmldebugclient
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmldebugclient CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebugclient CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmldebugclient CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebugclient CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
index fbbaa3a0f4..1bdc1ec192 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmldebuggingenabler
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmldebuggingenabler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebuggingenabler CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmldebuggingenabler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebuggingenabler CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
index ba2f013b05..11d16879ed 100644
--- a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qqmldebugjs
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmldebugjs CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebugjs CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmldebugjs CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebugjs CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
index 7712af32db..2b25248b0b 100644
--- a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmldebuglocal
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmldebuglocal CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebuglocal CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmldebuglocal CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebuglocal CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
index c4dcf92313..93ad4c76a7 100644
--- a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
@@ -37,12 +37,12 @@ qt_add_test(tst_qqmldebugservice
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmldebugservice CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebugservice CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmldebugservice CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebugservice CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt
index 7290b1e417..7264d7cbe5 100644
--- a/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt
@@ -34,12 +34,12 @@ qt_add_test(tst_qdebugtranslationservice
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qdebugtranslationservice CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qdebugtranslationservice CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qdebugtranslationservice CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qdebugtranslationservice CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
index 177215080b..a998af77cf 100644
--- a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qqmlenginecontrol
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlenginecontrol CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlenginecontrol CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlenginecontrol CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlenginecontrol CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
index 9b81b04568..f3fb518bfe 100644
--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
@@ -30,12 +30,12 @@ qt_add_test(tst_qqmlenginedebuginspectorintegration
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
index 758d63c6e9..fa7f15939e 100644
--- a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
@@ -25,12 +25,12 @@ qt_add_test(tst_qqmlenginedebugservice
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlenginedebugservice CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlenginedebugservice CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlenginedebugservice CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlenginedebugservice CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
index 5b5dc7cd52..4ddb1d436d 100644
--- a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
@@ -30,12 +30,12 @@ qt_add_test(tst_qqmlinspector
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlinspector CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlinspector CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlinspector CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlinspector CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
index 32013a9c32..6a509748ba 100644
--- a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
@@ -34,12 +34,12 @@ qt_add_test(tst_qqmlpreview
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlpreview CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlpreview CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlpreview CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlpreview CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
index 0972273b03..2395c84e7d 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
@@ -32,12 +32,12 @@ qt_add_test(tst_qqmlprofilerservice
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlprofilerservice CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlprofilerservice CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlprofilerservice CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlprofilerservice CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qjsonbinding/CMakeLists.txt b/tests/auto/qml/qjsonbinding/CMakeLists.txt
index f0bf6ef46d..d4c3ef3dac 100644
--- a/tests/auto/qml/qjsonbinding/CMakeLists.txt
+++ b/tests/auto/qml/qjsonbinding/CMakeLists.txt
@@ -26,12 +26,12 @@ qt_add_test(tst_qjsonbinding
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qjsonbinding CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qjsonbinding CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qjsonbinding CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qjsonbinding CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qmlcachegen/CMakeLists.txt b/tests/auto/qml/qmlcachegen/CMakeLists.txt
index 457fb328d0..e20f276cc1 100644
--- a/tests/auto/qml/qmlcachegen/CMakeLists.txt
+++ b/tests/auto/qml/qmlcachegen/CMakeLists.txt
@@ -113,12 +113,12 @@ if(UNIX)
     )
 endif()
 
-qt_extend_target(tst_qmlcachegen CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qmlcachegen CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qmlcachegen CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qmlcachegen CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qmlformat/CMakeLists.txt b/tests/auto/qml/qmlformat/CMakeLists.txt
index 483cc93aeb..14a8acb5d9 100644
--- a/tests/auto/qml/qmlformat/CMakeLists.txt
+++ b/tests/auto/qml/qmlformat/CMakeLists.txt
@@ -26,12 +26,12 @@ qt_add_test(tst_qmlformat
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmlformat CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qmlformat CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qmlformat CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qmlformat CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qmllint/CMakeLists.txt b/tests/auto/qml/qmllint/CMakeLists.txt
index a6d1ada7ad..a66507f625 100644
--- a/tests/auto/qml/qmllint/CMakeLists.txt
+++ b/tests/auto/qml/qmllint/CMakeLists.txt
@@ -24,12 +24,12 @@ qt_add_test(tst_qmllint
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmllint CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qmllint CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qmllint CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qmllint CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qmlplugindump/CMakeLists.txt b/tests/auto/qml/qmlplugindump/CMakeLists.txt
index a5d0eb7429..5f806b498b 100644
--- a/tests/auto/qml/qmlplugindump/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/CMakeLists.txt
@@ -20,12 +20,12 @@ add_qt_test(tst_qmlplugindump
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qmlplugindump CONDITION ANDROID OR APPLE_IOS
+extend_target(tst_qmlplugindump CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qmlplugindump CONDITION NOT ANDROID AND NOT APPLE_IOS
+extend_target(tst_qmlplugindump CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt
index c22b7485b6..cecbcba683 100644
--- a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt
+++ b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt
@@ -44,12 +44,12 @@ add_qt_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR APPLE_IOS
+extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlapplicationengine CONDITION NOT ANDROID AND NOT APPLE_IOS
+extend_target(tst_qqmlapplicationengine CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlbinding/CMakeLists.txt b/tests/auto/qml/qqmlbinding/CMakeLists.txt
index 35cf1244be..f885560bbe 100644
--- a/tests/auto/qml/qqmlbinding/CMakeLists.txt
+++ b/tests/auto/qml/qqmlbinding/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qqmlbinding
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlbinding CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlbinding CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlbinding CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlbinding CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlcomponent/CMakeLists.txt b/tests/auto/qml/qqmlcomponent/CMakeLists.txt
index 65fad5f210..e773e58cd2 100644
--- a/tests/auto/qml/qqmlcomponent/CMakeLists.txt
+++ b/tests/auto/qml/qqmlcomponent/CMakeLists.txt
@@ -43,12 +43,12 @@ qt_add_resource(tst_qqmlcomponent "qmake_immediate"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlcomponent CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlcomponent CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlcomponent CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlcomponent CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlconnections/CMakeLists.txt b/tests/auto/qml/qqmlconnections/CMakeLists.txt
index e7f0d87b0f..8f6b9ce87f 100644
--- a/tests/auto/qml/qqmlconnections/CMakeLists.txt
+++ b/tests/auto/qml/qqmlconnections/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qqmlconnections
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlconnections CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlconnections CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlconnections CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlconnections CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlconsole/CMakeLists.txt b/tests/auto/qml/qqmlconsole/CMakeLists.txt
index 3659532a23..f22fcbc4da 100644
--- a/tests/auto/qml/qqmlconsole/CMakeLists.txt
+++ b/tests/auto/qml/qqmlconsole/CMakeLists.txt
@@ -26,12 +26,12 @@ qt_add_test(tst_qqmlconsole
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlconsole CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlconsole CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlconsole CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlconsole CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlcontext/CMakeLists.txt b/tests/auto/qml/qqmlcontext/CMakeLists.txt
index 36b8d7c3e8..08982b837b 100644
--- a/tests/auto/qml/qqmlcontext/CMakeLists.txt
+++ b/tests/auto/qml/qqmlcontext/CMakeLists.txt
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmlcontext
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlcontext CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlcontext CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlcontext CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlcontext CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmldirparser/CMakeLists.txt b/tests/auto/qml/qqmldirparser/CMakeLists.txt
index 5a3b63f336..36f010d682 100644
--- a/tests/auto/qml/qqmldirparser/CMakeLists.txt
+++ b/tests/auto/qml/qqmldirparser/CMakeLists.txt
@@ -26,12 +26,12 @@ qt_add_test(tst_qqmldirparser
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmldirparser CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldirparser CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmldirparser CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldirparser CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt
index 8f50334294..a30688cfaa 100644
--- a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt
@@ -51,12 +51,12 @@ qt_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets
         Qt::Widgets
 )
 
-qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlecmascript/CMakeLists.txt b/tests/auto/qml/qqmlecmascript/CMakeLists.txt
index 17fed700c8..bf74b8ccba 100644
--- a/tests/auto/qml/qqmlecmascript/CMakeLists.txt
+++ b/tests/auto/qml/qqmlecmascript/CMakeLists.txt
@@ -58,12 +58,12 @@ qt_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets
         Qt::Widgets
 )
 
-qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlengine/CMakeLists.txt b/tests/auto/qml/qqmlengine/CMakeLists.txt
index 38e84ffd30..f692a1a3a5 100644
--- a/tests/auto/qml/qqmlengine/CMakeLists.txt
+++ b/tests/auto/qml/qqmlengine/CMakeLists.txt
@@ -47,12 +47,12 @@ qt_extend_target(tst_qqmlengine CONDITION boot2qt
         SKIP_GCCORRUPTION_TEST
 )
 
-qt_extend_target(tst_qqmlengine CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlengine CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlengine CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlengine CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
index 2a25d29c43..fd45760a35 100644
--- a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
+++ b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
@@ -19,12 +19,12 @@ qt_add_test(tst_qqmlenginecleanup
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlenginecleanup CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlenginecleanup CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlenginecleanup CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlenginecleanup CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlerror/CMakeLists.txt b/tests/auto/qml/qqmlerror/CMakeLists.txt
index 91085f74d6..c4d218fb8e 100644
--- a/tests/auto/qml/qqmlerror/CMakeLists.txt
+++ b/tests/auto/qml/qqmlerror/CMakeLists.txt
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmlerror
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlerror CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlerror CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlerror CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlerror CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlexpression/CMakeLists.txt b/tests/auto/qml/qqmlexpression/CMakeLists.txt
index f274d60367..55f85089bf 100644
--- a/tests/auto/qml/qqmlexpression/CMakeLists.txt
+++ b/tests/auto/qml/qqmlexpression/CMakeLists.txt
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmlexpression
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlexpression CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlexpression CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlexpression CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlexpression CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlfileselector/CMakeLists.txt b/tests/auto/qml/qqmlfileselector/CMakeLists.txt
index 6886391678..34e80921cb 100644
--- a/tests/auto/qml/qqmlfileselector/CMakeLists.txt
+++ b/tests/auto/qml/qqmlfileselector/CMakeLists.txt
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmlfileselector
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlfileselector CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlfileselector CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlfileselector CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlfileselector CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlimport/CMakeLists.txt b/tests/auto/qml/qqmlimport/CMakeLists.txt
index c4b5ac84b7..175543232f 100644
--- a/tests/auto/qml/qqmlimport/CMakeLists.txt
+++ b/tests/auto/qml/qqmlimport/CMakeLists.txt
@@ -39,12 +39,12 @@ qt_add_test(tst_qqmlimport
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlimport CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlimport CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlimport CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlimport CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlincubator/CMakeLists.txt b/tests/auto/qml/qqmlincubator/CMakeLists.txt
index 40fcaa2f6a..36879eee87 100644
--- a/tests/auto/qml/qqmlincubator/CMakeLists.txt
+++ b/tests/auto/qml/qqmlincubator/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qqmlincubator
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlincubator CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlincubator CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlincubator CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlincubator CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlinfo/CMakeLists.txt b/tests/auto/qml/qqmlinfo/CMakeLists.txt
index 55dc018552..70ba9cc1ba 100644
--- a/tests/auto/qml/qqmlinfo/CMakeLists.txt
+++ b/tests/auto/qml/qqmlinfo/CMakeLists.txt
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmlinfo
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlinfo CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlinfo CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlinfo CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlinfo CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlinstantiator/CMakeLists.txt b/tests/auto/qml/qqmlinstantiator/CMakeLists.txt
index b6d6e2b48e..36c496cbf3 100644
--- a/tests/auto/qml/qqmlinstantiator/CMakeLists.txt
+++ b/tests/auto/qml/qqmlinstantiator/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qqmlinstantiator
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlinstantiator CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlinstantiator CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlinstantiator CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlinstantiator CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlitemmodels/CMakeLists.txt b/tests/auto/qml/qqmlitemmodels/CMakeLists.txt
index 4b2a94a7d1..e531ac95c4 100644
--- a/tests/auto/qml/qqmlitemmodels/CMakeLists.txt
+++ b/tests/auto/qml/qqmlitemmodels/CMakeLists.txt
@@ -30,12 +30,12 @@ qt_add_test(tst_qqmlitemmodels
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlitemmodels CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlitemmodels CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlitemmodels CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlitemmodels CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllanguage/CMakeLists.txt b/tests/auto/qml/qqmllanguage/CMakeLists.txt
index 682d35bb1b..568ab7537e 100644
--- a/tests/auto/qml/qqmllanguage/CMakeLists.txt
+++ b/tests/auto/qml/qqmllanguage/CMakeLists.txt
@@ -52,12 +52,12 @@ if(ANDROID)
     )
 endif()
 
-qt_extend_target(tst_qqmllanguage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllanguage CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmllanguage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllanguage CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllistmodel/CMakeLists.txt b/tests/auto/qml/qqmllistmodel/CMakeLists.txt
index 05ff9268e6..b83e2b3cf1 100644
--- a/tests/auto/qml/qqmllistmodel/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistmodel/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qqmllistmodel
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmllistmodel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllistmodel CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmllistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllistmodel CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt b/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt
index 9f4fdb61a4..436f38a13b 100644
--- a/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qqmllistmodelworkerscript
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmllistmodelworkerscript CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllistmodelworkerscript CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmllistmodelworkerscript CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllistmodelworkerscript CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllistreference/CMakeLists.txt b/tests/auto/qml/qqmllistreference/CMakeLists.txt
index da8c3bc7bc..cb2d91826c 100644
--- a/tests/auto/qml/qqmllistreference/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistreference/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qqmllistreference
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmllistreference CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllistreference CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmllistreference CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllistreference CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmllocale/CMakeLists.txt b/tests/auto/qml/qqmllocale/CMakeLists.txt
index 03a3bd4de0..408f4a5c19 100644
--- a/tests/auto/qml/qqmllocale/CMakeLists.txt
+++ b/tests/auto/qml/qqmllocale/CMakeLists.txt
@@ -26,12 +26,12 @@ qt_add_test(tst_qqmllocale
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmllocale CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllocale CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmllocale CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllocale CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlmetaobject/CMakeLists.txt b/tests/auto/qml/qqmlmetaobject/CMakeLists.txt
index 93c88dd2ce..20e8fff759 100644
--- a/tests/auto/qml/qqmlmetaobject/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmetaobject/CMakeLists.txt
@@ -26,12 +26,12 @@ qt_add_test(tst_qqmlmetaobject
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlmetaobject CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlmetaobject CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlmetaobject CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlmetaobject CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlmetatype/CMakeLists.txt b/tests/auto/qml/qqmlmetatype/CMakeLists.txt
index ab13460c19..66f2a6586e 100644
--- a/tests/auto/qml/qqmlmetatype/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmetatype/CMakeLists.txt
@@ -52,12 +52,12 @@ qt_add_resource(tst_qqmlmetatype "qmake_qmldirresource"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlmetatype CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlmetatype CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlmetatype CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlmetatype CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt
index 3a1251655a..d7665ece5e 100644
--- a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt
@@ -59,12 +59,12 @@ add_qt_resource(tst_qqmlmoduleplugin "qmake_staticPlugin"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR APPLE_IOS
+extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT APPLE_IOS
+extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt
index 975a424475..111fdafb88 100644
--- a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt
@@ -77,12 +77,12 @@ add_qt_resource(tst_qqmlmoduleplugin staticPlugin
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR APPLE_IOS
+extend_target(tst_qqmlmoduleplugin CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT APPLE_IOS
+extend_target(tst_qqmlmoduleplugin CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlnotifier/CMakeLists.txt b/tests/auto/qml/qqmlnotifier/CMakeLists.txt
index 5756cb353d..75c4893e26 100644
--- a/tests/auto/qml/qqmlnotifier/CMakeLists.txt
+++ b/tests/auto/qml/qqmlnotifier/CMakeLists.txt
@@ -25,12 +25,12 @@ qt_add_test(tst_qqmlnotifier
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlnotifier CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlnotifier CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlnotifier CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlnotifier CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlparser/CMakeLists.txt b/tests/auto/qml/qqmlparser/CMakeLists.txt
index 831fdff0e1..6fc6135e5f 100644
--- a/tests/auto/qml/qqmlparser/CMakeLists.txt
+++ b/tests/auto/qml/qqmlparser/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_extend_target(tst_qqmlparser CONDITION CMAKE_CROSSCOMPILING
         QTEST_CROSS_COMPILED
 )
 
-qt_extend_target(tst_qqmlparser CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlparser CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlparser CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlparser CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlpromise/CMakeLists.txt b/tests/auto/qml/qqmlpromise/CMakeLists.txt
index 870bdef320..591ad850db 100644
--- a/tests/auto/qml/qqmlpromise/CMakeLists.txt
+++ b/tests/auto/qml/qqmlpromise/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qqmlpromise
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlpromise CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlpromise CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlpromise CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlpromise CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlproperty/CMakeLists.txt b/tests/auto/qml/qqmlproperty/CMakeLists.txt
index 5899210558..ea81a3f337 100644
--- a/tests/auto/qml/qqmlproperty/CMakeLists.txt
+++ b/tests/auto/qml/qqmlproperty/CMakeLists.txt
@@ -32,12 +32,12 @@ qt_add_test(tst_qqmlproperty
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlproperty CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlproperty CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlproperty CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlproperty CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlpropertycache/CMakeLists.txt b/tests/auto/qml/qqmlpropertycache/CMakeLists.txt
index 53a3c7b5dc..7c84ef687a 100644
--- a/tests/auto/qml/qqmlpropertycache/CMakeLists.txt
+++ b/tests/auto/qml/qqmlpropertycache/CMakeLists.txt
@@ -27,12 +27,12 @@ qt_add_test(tst_qqmlpropertycache
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlpropertycache CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlpropertycache CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlpropertycache CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlpropertycache CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
index a327b2a500..7d5bce3056 100644
--- a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
+++ b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qqmlpropertymap
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlpropertymap CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlpropertymap CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlpropertymap CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlpropertymap CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlqt/CMakeLists.txt b/tests/auto/qml/qqmlqt/CMakeLists.txt
index 6b742636dc..085c7e0f75 100644
--- a/tests/auto/qml/qqmlqt/CMakeLists.txt
+++ b/tests/auto/qml/qqmlqt/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qqmlqt
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlqt CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlqt CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlqt CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlqt CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlsettings/CMakeLists.txt b/tests/auto/qml/qqmlsettings/CMakeLists.txt
index 6463c414d0..40bc827555 100644
--- a/tests/auto/qml/qqmlsettings/CMakeLists.txt
+++ b/tests/auto/qml/qqmlsettings/CMakeLists.txt
@@ -25,12 +25,12 @@ qt_add_test(tst_qqmlsettings
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlsettings CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlsettings CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlsettings CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlsettings CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt b/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt
index a5785fb650..bc4a88653b 100644
--- a/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt
+++ b/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qqmlsqldatabase
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlsqldatabase CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlsqldatabase CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlsqldatabase CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlsqldatabase CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlstatemachine/CMakeLists.txt b/tests/auto/qml/qqmlstatemachine/CMakeLists.txt
index d826173665..4ffe1c3906 100644
--- a/tests/auto/qml/qqmlstatemachine/CMakeLists.txt
+++ b/tests/auto/qml/qqmlstatemachine/CMakeLists.txt
@@ -21,12 +21,12 @@ qt_add_test(tst_qqmlstatemachine
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlstatemachine CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlstatemachine CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlstatemachine CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlstatemachine CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltablemodel/CMakeLists.txt b/tests/auto/qml/qqmltablemodel/CMakeLists.txt
index f41e565178..ee33bb4517 100644
--- a/tests/auto/qml/qqmltablemodel/CMakeLists.txt
+++ b/tests/auto/qml/qqmltablemodel/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qqmltablemodel
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmltablemodel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmltablemodel CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmltablemodel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmltablemodel CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt
index b33258c937..f62dfd9a3e 100644
--- a/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt
@@ -43,12 +43,12 @@ qt_add_resource(tst_qqmltranslation "translation"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmltranslation CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmltranslation CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltranslation/CMakeLists.txt b/tests/auto/qml/qqmltranslation/CMakeLists.txt
index b1cd51b9e9..8e280cc1de 100644
--- a/tests/auto/qml/qqmltranslation/CMakeLists.txt
+++ b/tests/auto/qml/qqmltranslation/CMakeLists.txt
@@ -57,12 +57,12 @@ qt_add_resource(tst_qqmltranslation "translation"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmltranslation CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmltranslation CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmltypeloader/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/CMakeLists.txt
index 02b4ec6059..bad19361a5 100644
--- a/tests/auto/qml/qqmltypeloader/CMakeLists.txt
+++ b/tests/auto/qml/qqmltypeloader/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qqmltypeloader
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmltypeloader CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmltypeloader CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmltypeloader CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmltypeloader CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt b/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt
index 9c6e82e345..6af68cb1ce 100644
--- a/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt
+++ b/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qqmlvaluetypeproviders
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlvaluetypeproviders CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlvaluetypeproviders CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlvaluetypeproviders CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlvaluetypeproviders CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt b/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt
index 530ab2352d..0fc8045f38 100644
--- a/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt
+++ b/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt
@@ -32,12 +32,12 @@ qt_add_test(tst_qqmlvaluetypes
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlvaluetypes CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlvaluetypes CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlvaluetypes CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlvaluetypes CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt b/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt
index 8a25ab6c27..233a3aac62 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt
+++ b/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qqmlxmlhttprequest
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlxmlhttprequest CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlxmlhttprequest CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qqmlxmlhttprequest CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlxmlhttprequest CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt
index c35afd5081..b222e3db6d 100644
--- a/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt
@@ -42,12 +42,12 @@ qt_add_resource(tst_qquickfolderlistmodel "introspect"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
index fdfe9967bb..326f8245e9 100644
--- a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
+++ b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
@@ -45,12 +45,12 @@ qt_add_resource(tst_qquickfolderlistmodel "introspect"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qquickworkerscript/CMakeLists.txt b/tests/auto/qml/qquickworkerscript/CMakeLists.txt
index 7445ade3cd..de9e45d662 100644
--- a/tests/auto/qml/qquickworkerscript/CMakeLists.txt
+++ b/tests/auto/qml/qquickworkerscript/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qquickworkerscript
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickworkerscript CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickworkerscript CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickworkerscript CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickworkerscript CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qtqmlmodules/CMakeLists.txt b/tests/auto/qml/qtqmlmodules/CMakeLists.txt
index 210af57e23..b42cb964b8 100644
--- a/tests/auto/qml/qtqmlmodules/CMakeLists.txt
+++ b/tests/auto/qml/qtqmlmodules/CMakeLists.txt
@@ -27,12 +27,12 @@ qt_add_test(tst_qtqmlmodules
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qtqmlmodules CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qtqmlmodules CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qtqmlmodules CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qtqmlmodules CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qv4assembler/CMakeLists.txt b/tests/auto/qml/qv4assembler/CMakeLists.txt
index 13ce682c9a..b54dd67816 100644
--- a/tests/auto/qml/qv4assembler/CMakeLists.txt
+++ b/tests/auto/qml/qv4assembler/CMakeLists.txt
@@ -25,12 +25,12 @@ qt_add_test(tst_qv4assembler
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qv4assembler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qv4assembler CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qv4assembler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qv4assembler CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qml/qv4mm/CMakeLists.txt b/tests/auto/qml/qv4mm/CMakeLists.txt
index b4c4c82f4f..b319f36792 100644
--- a/tests/auto/qml/qv4mm/CMakeLists.txt
+++ b/tests/auto/qml/qv4mm/CMakeLists.txt
@@ -26,12 +26,12 @@ qt_add_test(tst_qv4mm
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qv4mm CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qv4mm CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qv4mm CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qv4mm CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/drawingmodes/CMakeLists.txt b/tests/auto/quick/drawingmodes/CMakeLists.txt
index 79600f8faf..e225df5424 100644
--- a/tests/auto/quick/drawingmodes/CMakeLists.txt
+++ b/tests/auto/quick/drawingmodes/CMakeLists.txt
@@ -31,12 +31,12 @@ qt_add_test(tst_drawingmodes
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_drawingmodes CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_drawingmodes CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_drawingmodes CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_drawingmodes CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt
index 86f5a1dae5..0d6cc7b58b 100644
--- a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt
@@ -36,12 +36,12 @@ qt_add_test(tst_flickableinterop
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_flickableinterop CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_flickableinterop CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_flickableinterop CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_flickableinterop CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt
index 3ea3d2d03b..8868ccdbbc 100644
--- a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt
@@ -36,12 +36,12 @@ qt_add_test(tst_multipointtoucharea_interop
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_multipointtoucharea_interop CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_multipointtoucharea_interop CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_multipointtoucharea_interop CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_multipointtoucharea_interop CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt
index 13d399768c..825260f53d 100644
--- a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt
@@ -36,12 +36,12 @@ qt_add_test(tst_qquickdraghandler
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickdraghandler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickdraghandler CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickdraghandler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickdraghandler CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt
index 38f25e2764..7ff86c7c6e 100644
--- a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt
@@ -36,12 +36,12 @@ qt_add_test(tst_qquickhoverhandler
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickhoverhandler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickhoverhandler CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickhoverhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickhoverhandler CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt
index 369cf0ae0c..110948c4ee 100644
--- a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt
@@ -36,12 +36,12 @@ qt_add_test(tst_qquickpinchhandler
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickpinchhandler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpinchhandler CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickpinchhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpinchhandler CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt
index 4b4e453105..7da285b4ce 100644
--- a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qquickpointerhandler
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickpointerhandler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpointerhandler CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickpointerhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpointerhandler CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt
index 788a0bdfa3..51312f1db3 100644
--- a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt
@@ -36,12 +36,12 @@ qt_add_test(tst_qquickpointhandler
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickpointhandler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpointhandler CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickpointhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpointhandler CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt
index a8a9d5ae17..97c8106931 100644
--- a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qquicktaphandler
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquicktaphandler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktaphandler CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquicktaphandler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktaphandler CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt
index 0d599fed4e..32d7ce9398 100644
--- a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt
@@ -36,12 +36,12 @@ qt_add_test(tst_qquickwheelhandler
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickwheelhandler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickwheelhandler CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickwheelhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickwheelhandler CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickaccessible/CMakeLists.txt b/tests/auto/quick/qquickaccessible/CMakeLists.txt
index 3b0c4da56c..e6a34e0d3f 100644
--- a/tests/auto/quick/qquickaccessible/CMakeLists.txt
+++ b/tests/auto/quick/qquickaccessible/CMakeLists.txt
@@ -32,12 +32,12 @@ qt_add_test(tst_qquickaccessible
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickaccessible CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickaccessible CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickaccessible CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickaccessible CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickanchors/CMakeLists.txt b/tests/auto/quick/qquickanchors/CMakeLists.txt
index 05977d740f..04065b9057 100644
--- a/tests/auto/quick/qquickanchors/CMakeLists.txt
+++ b/tests/auto/quick/qquickanchors/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qquickanchors
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickanchors CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickanchors CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickanchors CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickanchors CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt
index ef7c02e88d..ea18c9b5a5 100644
--- a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt
@@ -30,12 +30,12 @@ qt_add_test(tst_qquickanimatedimage
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickanimatedimage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickanimatedimage CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickanimatedimage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickanimatedimage CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt
index 6deac34ef6..3165a91673 100644
--- a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qquickanimatedsprite
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickanimatedsprite CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickanimatedsprite CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickanimatedsprite CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickanimatedsprite CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickanimations/CMakeLists.txt b/tests/auto/quick/qquickanimations/CMakeLists.txt
index 9b556638d3..e0f9d38f90 100644
--- a/tests/auto/quick/qquickanimations/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimations/CMakeLists.txt
@@ -34,12 +34,12 @@ qt_add_test(tst_qquickanimations
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickanimations CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickanimations CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickanimations CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickanimations CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickapplication/CMakeLists.txt b/tests/auto/quick/qquickapplication/CMakeLists.txt
index b45f76ca0d..b26bb64b09 100644
--- a/tests/auto/quick/qquickapplication/CMakeLists.txt
+++ b/tests/auto/quick/qquickapplication/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qquickapplication
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickapplication CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickapplication CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickapplication CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickapplication CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickbehaviors/CMakeLists.txt b/tests/auto/quick/qquickbehaviors/CMakeLists.txt
index 7596076c00..f305fb030f 100644
--- a/tests/auto/quick/qquickbehaviors/CMakeLists.txt
+++ b/tests/auto/quick/qquickbehaviors/CMakeLists.txt
@@ -31,12 +31,12 @@ qt_add_test(tst_qquickbehaviors
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickbehaviors CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickbehaviors CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickbehaviors CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickbehaviors CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickborderimage/CMakeLists.txt b/tests/auto/quick/qquickborderimage/CMakeLists.txt
index 452f5a729b..9bcb99befa 100644
--- a/tests/auto/quick/qquickborderimage/CMakeLists.txt
+++ b/tests/auto/quick/qquickborderimage/CMakeLists.txt
@@ -35,12 +35,12 @@ qt_add_test(tst_qquickborderimage
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickborderimage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickborderimage CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickborderimage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickborderimage CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt
index 7b410e578c..5fc6d1c2f0 100644
--- a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt
+++ b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt
@@ -34,12 +34,12 @@ qt_add_test(tst_qquickboundaryrule
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickboundaryrule CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickboundaryrule CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickboundaryrule CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickboundaryrule CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
index 8582a77561..4ce3896d23 100644
--- a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
+++ b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
@@ -36,12 +36,12 @@ qt_add_test(tst_qquickdesignersupport
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickdesignersupport CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickdesignersupport CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickdesignersupport CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickdesignersupport CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickdroparea/CMakeLists.txt b/tests/auto/quick/qquickdroparea/CMakeLists.txt
index f711d51b3a..2e64905df5 100644
--- a/tests/auto/quick/qquickdroparea/CMakeLists.txt
+++ b/tests/auto/quick/qquickdroparea/CMakeLists.txt
@@ -37,12 +37,12 @@ qt_add_test(tst_qquickdroparea
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickdroparea CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickdroparea CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt b/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt
index 82638f0624..e843088036 100644
--- a/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt
+++ b/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt
@@ -26,12 +26,12 @@ qt_add_test(tst_qquickdynamicpropertyanimation
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickdynamicpropertyanimation CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickdynamicpropertyanimation CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickdynamicpropertyanimation CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickdynamicpropertyanimation CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickflickable/CMakeLists.txt b/tests/auto/quick/qquickflickable/CMakeLists.txt
index 99aac8c0f9..579f5bcfd7 100644
--- a/tests/auto/quick/qquickflickable/CMakeLists.txt
+++ b/tests/auto/quick/qquickflickable/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qquickflickable
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickflickable CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickflickable CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickflickable CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickflickable CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickflipable/CMakeLists.txt b/tests/auto/quick/qquickflipable/CMakeLists.txt
index e037cb2870..e30d57a4ba 100644
--- a/tests/auto/quick/qquickflipable/CMakeLists.txt
+++ b/tests/auto/quick/qquickflipable/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qquickflipable
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickflipable CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickflipable CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickflipable CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickflipable CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickfocusscope/CMakeLists.txt b/tests/auto/quick/qquickfocusscope/CMakeLists.txt
index 987d9f2c08..f106e8bde2 100644
--- a/tests/auto/quick/qquickfocusscope/CMakeLists.txt
+++ b/tests/auto/quick/qquickfocusscope/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qquickfocusscope
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickfocusscope CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickfocusscope CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickfocusscope CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickfocusscope CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickfontloader/CMakeLists.txt b/tests/auto/quick/qquickfontloader/CMakeLists.txt
index 03ff5a1a83..d244c0a2e7 100644
--- a/tests/auto/quick/qquickfontloader/CMakeLists.txt
+++ b/tests/auto/quick/qquickfontloader/CMakeLists.txt
@@ -30,12 +30,12 @@ qt_add_test(tst_qquickfontloader
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickfontloader CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickfontloader CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickfontloader CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickfontloader CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt
index 8679830ea4..ce25511fca 100644
--- a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt
+++ b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt
@@ -31,12 +31,12 @@ qt_add_test(tst_qquickfontloader_static
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickfontloader_static CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickfontloader_static CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickfontloader_static CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickfontloader_static CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickframebufferobject/CMakeLists.txt b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt
index 0f04723557..ba720e1d26 100644
--- a/tests/auto/quick/qquickframebufferobject/CMakeLists.txt
+++ b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qquickframebufferobject
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickframebufferobject CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickframebufferobject CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickframebufferobject CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickframebufferobject CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt b/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt
index 0393d805e6..a85a526ca4 100644
--- a/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt
+++ b/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qquickgraphicsinfo
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickgraphicsinfo CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickgraphicsinfo CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickgraphicsinfo CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickgraphicsinfo CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickgridview/CMakeLists.txt b/tests/auto/quick/qquickgridview/CMakeLists.txt
index f67fc203d4..de7cfe581c 100644
--- a/tests/auto/quick/qquickgridview/CMakeLists.txt
+++ b/tests/auto/quick/qquickgridview/CMakeLists.txt
@@ -38,12 +38,12 @@ qt_add_test(tst_qquickgridview
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickgridview CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickgridview CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickgridview CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickgridview CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickimage/CMakeLists.txt b/tests/auto/quick/qquickimage/CMakeLists.txt
index 28f09b02d1..4aeed8b2f2 100644
--- a/tests/auto/quick/qquickimage/CMakeLists.txt
+++ b/tests/auto/quick/qquickimage/CMakeLists.txt
@@ -35,12 +35,12 @@ qt_add_test(tst_qquickimage
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickimage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickimage CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickimage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickimage CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickitem/CMakeLists.txt b/tests/auto/quick/qquickitem/CMakeLists.txt
index bb829a99a1..00882afa3a 100644
--- a/tests/auto/quick/qquickitem/CMakeLists.txt
+++ b/tests/auto/quick/qquickitem/CMakeLists.txt
@@ -40,12 +40,12 @@ qt_extend_target(tst_qquickitem CONDITION TARGET Qt::Widgets
         Qt::Widgets
 )
 
-qt_extend_target(tst_qquickitem CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickitem CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickitem CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickitem CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickitem2/CMakeLists.txt b/tests/auto/quick/qquickitem2/CMakeLists.txt
index 5177123d6f..5d8bb99dee 100644
--- a/tests/auto/quick/qquickitem2/CMakeLists.txt
+++ b/tests/auto/quick/qquickitem2/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qquickitem2
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickitem2 CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickitem2 CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickitem2 CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickitem2 CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickitemlayer/CMakeLists.txt b/tests/auto/quick/qquickitemlayer/CMakeLists.txt
index 25024bce0c..d81ae9ecc2 100644
--- a/tests/auto/quick/qquickitemlayer/CMakeLists.txt
+++ b/tests/auto/quick/qquickitemlayer/CMakeLists.txt
@@ -31,12 +31,12 @@ qt_add_test(tst_qquickitemlayer
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickitemlayer CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickitemlayer CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickitemlayer CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickitemlayer CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquicklistview/CMakeLists.txt b/tests/auto/quick/qquicklistview/CMakeLists.txt
index e983bcac96..9244fb6cee 100644
--- a/tests/auto/quick/qquicklistview/CMakeLists.txt
+++ b/tests/auto/quick/qquicklistview/CMakeLists.txt
@@ -43,12 +43,12 @@ qt_add_test(tst_qquicklistview
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquicklistview CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicklistview CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquicklistview CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicklistview CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickloader/CMakeLists.txt b/tests/auto/quick/qquickloader/CMakeLists.txt
index 8ebb9d261f..114598bd3f 100644
--- a/tests/auto/quick/qquickloader/CMakeLists.txt
+++ b/tests/auto/quick/qquickloader/CMakeLists.txt
@@ -35,12 +35,12 @@ qt_add_test(tst_qquickloader
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickloader CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickloader CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickloader CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickloader CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickmousearea/CMakeLists.txt b/tests/auto/quick/qquickmousearea/CMakeLists.txt
index f06518d100..969bb745f3 100644
--- a/tests/auto/quick/qquickmousearea/CMakeLists.txt
+++ b/tests/auto/quick/qquickmousearea/CMakeLists.txt
@@ -38,12 +38,12 @@ qt_add_test(tst_qquickmousearea
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickmousearea CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickmousearea CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickmousearea CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickmousearea CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt
index 70c533d791..dff7c77ceb 100644
--- a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt
+++ b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qquickmultipointtoucharea
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickmultipointtoucharea CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickmultipointtoucharea CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickmultipointtoucharea CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickmultipointtoucharea CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickopenglinfo/CMakeLists.txt b/tests/auto/quick/qquickopenglinfo/CMakeLists.txt
index c0bc92c73f..ba483df856 100644
--- a/tests/auto/quick/qquickopenglinfo/CMakeLists.txt
+++ b/tests/auto/quick/qquickopenglinfo/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qquickopenglinfo
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickopenglinfo CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickopenglinfo CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickopenglinfo CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickopenglinfo CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickpath/CMakeLists.txt b/tests/auto/quick/qquickpath/CMakeLists.txt
index bae3f9065b..fa41ef74e1 100644
--- a/tests/auto/quick/qquickpath/CMakeLists.txt
+++ b/tests/auto/quick/qquickpath/CMakeLists.txt
@@ -31,12 +31,12 @@ qt_add_test(tst_qquickpath
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickpath CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpath CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickpath CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpath CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickpathview/CMakeLists.txt b/tests/auto/quick/qquickpathview/CMakeLists.txt
index 3a36f7fb2a..c3df8ff6a6 100644
--- a/tests/auto/quick/qquickpathview/CMakeLists.txt
+++ b/tests/auto/quick/qquickpathview/CMakeLists.txt
@@ -40,12 +40,12 @@ qt_extend_target(tst_qquickpathview CONDITION TARGET Qt::Widgets
         Qt::Widgets
 )
 
-qt_extend_target(tst_qquickpathview CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpathview CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickpathview CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpathview CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickpincharea/CMakeLists.txt b/tests/auto/quick/qquickpincharea/CMakeLists.txt
index 6ee34e5ca4..d9394bad9e 100644
--- a/tests/auto/quick/qquickpincharea/CMakeLists.txt
+++ b/tests/auto/quick/qquickpincharea/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qquickpincharea
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickpincharea CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpincharea CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickpincharea CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpincharea CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt
index d76a29a861..cb2debfe6d 100644
--- a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt
+++ b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt
@@ -31,12 +31,12 @@ qt_add_test(tst_qquickpixmapcache
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickpixmapcache CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpixmapcache CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickpixmapcache CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpixmapcache CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickpositioners/CMakeLists.txt b/tests/auto/quick/qquickpositioners/CMakeLists.txt
index ce44673738..040f045598 100644
--- a/tests/auto/quick/qquickpositioners/CMakeLists.txt
+++ b/tests/auto/quick/qquickpositioners/CMakeLists.txt
@@ -34,12 +34,12 @@ qt_add_test(tst_qquickpositioners
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickpositioners CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpositioners CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickpositioners CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpositioners CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickrectangle/CMakeLists.txt b/tests/auto/quick/qquickrectangle/CMakeLists.txt
index 0d44623441..4a563432b6 100644
--- a/tests/auto/quick/qquickrectangle/CMakeLists.txt
+++ b/tests/auto/quick/qquickrectangle/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qquickrectangle
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickrectangle CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickrectangle CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickrectangle CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickrectangle CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickrepeater/CMakeLists.txt b/tests/auto/quick/qquickrepeater/CMakeLists.txt
index 3eecbc6c54..950608e0b7 100644
--- a/tests/auto/quick/qquickrepeater/CMakeLists.txt
+++ b/tests/auto/quick/qquickrepeater/CMakeLists.txt
@@ -34,12 +34,12 @@ qt_add_test(tst_qquickrepeater
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickrepeater CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickrepeater CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickrepeater CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickrepeater CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickscreen/CMakeLists.txt b/tests/auto/quick/qquickscreen/CMakeLists.txt
index 201393139a..4838fd8321 100644
--- a/tests/auto/quick/qquickscreen/CMakeLists.txt
+++ b/tests/auto/quick/qquickscreen/CMakeLists.txt
@@ -21,12 +21,12 @@ qt_add_test(tst_qquickscreen
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickscreen CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickscreen CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickscreen CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickscreen CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickshadereffect/CMakeLists.txt b/tests/auto/quick/qquickshadereffect/CMakeLists.txt
index 7d3b7b26be..dbdf2610d2 100644
--- a/tests/auto/quick/qquickshadereffect/CMakeLists.txt
+++ b/tests/auto/quick/qquickshadereffect/CMakeLists.txt
@@ -21,12 +21,12 @@ qt_add_test(tst_qquickshadereffect
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickshadereffect CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickshadereffect CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickshadereffect CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickshadereffect CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickshape/CMakeLists.txt b/tests/auto/quick/qquickshape/CMakeLists.txt
index fa75b37c1d..96e48c29e5 100644
--- a/tests/auto/quick/qquickshape/CMakeLists.txt
+++ b/tests/auto/quick/qquickshape/CMakeLists.txt
@@ -42,12 +42,12 @@ qt_extend_target(tst_qquickshape CONDITION TARGET Qt::Widgets
         Qt::Widgets
 )
 
-qt_extend_target(tst_qquickshape CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickshape CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickshape CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickshape CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickshortcut/CMakeLists.txt b/tests/auto/quick/qquickshortcut/CMakeLists.txt
index 8bad39e70c..c3986d263d 100644
--- a/tests/auto/quick/qquickshortcut/CMakeLists.txt
+++ b/tests/auto/quick/qquickshortcut/CMakeLists.txt
@@ -31,12 +31,12 @@ qt_extend_target(tst_qquickshortcut CONDITION TARGET Qt::Widgets
         Qt::QuickWidgets
 )
 
-qt_extend_target(tst_qquickshortcut CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickshortcut CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickshortcut CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickshortcut CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt
index 2c1e59e459..31841f2740 100644
--- a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt
+++ b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qquicksmoothedanimation
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquicksmoothedanimation CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicksmoothedanimation CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquicksmoothedanimation CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicksmoothedanimation CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickspringanimation/CMakeLists.txt b/tests/auto/quick/qquickspringanimation/CMakeLists.txt
index ba86dacc82..4831c67c10 100644
--- a/tests/auto/quick/qquickspringanimation/CMakeLists.txt
+++ b/tests/auto/quick/qquickspringanimation/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qquickspringanimation
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickspringanimation CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickspringanimation CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickspringanimation CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickspringanimation CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickspritesequence/CMakeLists.txt b/tests/auto/quick/qquickspritesequence/CMakeLists.txt
index bc6711dae3..6887b1ee79 100644
--- a/tests/auto/quick/qquickspritesequence/CMakeLists.txt
+++ b/tests/auto/quick/qquickspritesequence/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_qquickspritesequence
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickspritesequence CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickspritesequence CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickspritesequence CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickspritesequence CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickstates/CMakeLists.txt b/tests/auto/quick/qquickstates/CMakeLists.txt
index b512e2c8d0..78a68c0f15 100644
--- a/tests/auto/quick/qquickstates/CMakeLists.txt
+++ b/tests/auto/quick/qquickstates/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qquickstates
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickstates CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickstates CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickstates CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickstates CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquicktableview/CMakeLists.txt b/tests/auto/quick/qquicktableview/CMakeLists.txt
index 9d61c40cdb..70456af1d6 100644
--- a/tests/auto/quick/qquicktableview/CMakeLists.txt
+++ b/tests/auto/quick/qquicktableview/CMakeLists.txt
@@ -39,12 +39,12 @@ qt_add_test(tst_qquicktableview
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquicktableview CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktableview CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquicktableview CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktableview CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquicktext/CMakeLists.txt b/tests/auto/quick/qquicktext/CMakeLists.txt
index ba3f9dcbfa..7b1edd910f 100644
--- a/tests/auto/quick/qquicktext/CMakeLists.txt
+++ b/tests/auto/quick/qquicktext/CMakeLists.txt
@@ -31,12 +31,12 @@ qt_add_test(tst_qquicktext
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquicktext CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktext CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquicktext CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktext CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquicktextdocument/CMakeLists.txt b/tests/auto/quick/qquicktextdocument/CMakeLists.txt
index 6785baad42..7d2f750549 100644
--- a/tests/auto/quick/qquicktextdocument/CMakeLists.txt
+++ b/tests/auto/quick/qquicktextdocument/CMakeLists.txt
@@ -28,12 +28,12 @@ qt_add_test(tst_qquicktextdocument
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquicktextdocument CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktextdocument CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquicktextdocument CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktextdocument CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquicktextedit/CMakeLists.txt b/tests/auto/quick/qquicktextedit/CMakeLists.txt
index 29b6df96c5..4a4cc3811e 100644
--- a/tests/auto/quick/qquicktextedit/CMakeLists.txt
+++ b/tests/auto/quick/qquicktextedit/CMakeLists.txt
@@ -35,17 +35,17 @@ qt_add_test(tst_qquicktextedit
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquicktextedit CONDITION APPLE_OSX
+qt_extend_target(tst_qquicktextedit CONDITION MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
 
-qt_extend_target(tst_qquicktextedit CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktextedit CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquicktextedit CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktextedit CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquicktextinput/CMakeLists.txt b/tests/auto/quick/qquicktextinput/CMakeLists.txt
index 22b3e3d953..dff1a6f555 100644
--- a/tests/auto/quick/qquicktextinput/CMakeLists.txt
+++ b/tests/auto/quick/qquicktextinput/CMakeLists.txt
@@ -29,17 +29,17 @@ qt_add_test(tst_qquicktextinput
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquicktextinput CONDITION APPLE_OSX
+qt_extend_target(tst_qquicktextinput CONDITION MACOS
     PUBLIC_LIBRARIES
         ${FWAppKit}
 )
 
-qt_extend_target(tst_qquicktextinput CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktextinput CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquicktextinput CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktextinput CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickview/CMakeLists.txt b/tests/auto/quick/qquickview/CMakeLists.txt
index 3a677cad94..ce0f0fad68 100644
--- a/tests/auto/quick/qquickview/CMakeLists.txt
+++ b/tests/auto/quick/qquickview/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_qquickview
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickview CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickview CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickview CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickview CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt
index db88f6eb26..81e9fe3601 100644
--- a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt
+++ b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt
@@ -39,12 +39,12 @@ qt_extend_target(tst_qquickvisualdatamodel CONDITION TARGET Qt::Widgets
         Qt::Widgets
 )
 
-qt_extend_target(tst_qquickvisualdatamodel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickvisualdatamodel CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickvisualdatamodel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickvisualdatamodel CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/qquickwindow/CMakeLists.txt b/tests/auto/quick/qquickwindow/CMakeLists.txt
index 3cfe0b4660..5d9f91280e 100644
--- a/tests/auto/quick/qquickwindow/CMakeLists.txt
+++ b/tests/auto/quick/qquickwindow/CMakeLists.txt
@@ -36,12 +36,12 @@ qt_add_test(tst_qquickwindow
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickwindow CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickwindow CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickwindow CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickwindow CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/rendernode/CMakeLists.txt b/tests/auto/quick/rendernode/CMakeLists.txt
index 0291bcc3f4..970934b3fb 100644
--- a/tests/auto/quick/rendernode/CMakeLists.txt
+++ b/tests/auto/quick/rendernode/CMakeLists.txt
@@ -31,12 +31,12 @@ qt_add_test(tst_rendernode
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_rendernode CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_rendernode CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_rendernode CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_rendernode CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/scenegraph/CMakeLists.txt b/tests/auto/quick/scenegraph/CMakeLists.txt
index 4367ed69c7..3e7fa6fe88 100644
--- a/tests/auto/quick/scenegraph/CMakeLists.txt
+++ b/tests/auto/quick/scenegraph/CMakeLists.txt
@@ -29,12 +29,12 @@ qt_add_test(tst_scenegraph
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_scenegraph CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_scenegraph CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_scenegraph CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_scenegraph CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quick/touchmouse/CMakeLists.txt b/tests/auto/quick/touchmouse/CMakeLists.txt
index 02e2c1401b..a07596018e 100644
--- a/tests/auto/quick/touchmouse/CMakeLists.txt
+++ b/tests/auto/quick/touchmouse/CMakeLists.txt
@@ -33,12 +33,12 @@ qt_add_test(tst_touchmouse
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_touchmouse CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_touchmouse CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_touchmouse CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_touchmouse CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quicktest/polish-qml/CMakeLists.txt b/tests/auto/quicktest/polish-qml/CMakeLists.txt
index bd7c739433..56038660d9 100644
--- a/tests/auto/quicktest/polish-qml/CMakeLists.txt
+++ b/tests/auto/quicktest/polish-qml/CMakeLists.txt
@@ -27,12 +27,12 @@ qt_add_test(tst_polish-qml
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_polish-qml CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_polish-qml CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_polish-qml CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_polish-qml CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quicktest/polish/CMakeLists.txt b/tests/auto/quicktest/polish/CMakeLists.txt
index 946dd32980..9c5104400c 100644
--- a/tests/auto/quicktest/polish/CMakeLists.txt
+++ b/tests/auto/quicktest/polish/CMakeLists.txt
@@ -27,12 +27,12 @@ qt_add_test(tst_polish
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_polish CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_polish CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_polish CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_polish CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt b/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt
index 4b10858548..252c1011af 100644
--- a/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt
+++ b/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt
@@ -26,12 +26,12 @@ qt_add_test(tst_quicktestmainwithsetup
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_quicktestmainwithsetup CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_quicktestmainwithsetup CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_quicktestmainwithsetup CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_quicktestmainwithsetup CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quicktest/signalspy/CMakeLists.txt b/tests/auto/quicktest/signalspy/CMakeLists.txt
index eef90449ff..8d9d864ec1 100644
--- a/tests/auto/quicktest/signalspy/CMakeLists.txt
+++ b/tests/auto/quicktest/signalspy/CMakeLists.txt
@@ -19,12 +19,12 @@ qt_add_test(tst_signalspy
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_signalspy CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_signalspy CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_signalspy CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_signalspy CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt b/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt
index 5c161885d2..f8908592e6 100644
--- a/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt
+++ b/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt
@@ -34,12 +34,12 @@ qt_add_test(tst_qquickwidget
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickwidget CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickwidget CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickwidget CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickwidget CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
author	Tor Arne Vestbø <torarnv@gmail.com>	2020-03-16 14:10:44 +0100
committer	Tor Arne Vestbø <torarnv@gmail.com>	2020-03-17 10:42:00 +0100
commit	a5df29201fb795503635ddaae787ade5b96bff5e (patch)
tree	340a4d8021ce04a58e7252a03c33b6732caee942 /tests/auto
parent	db554e8e1c3242634d035ebb3dcbe3c441d80bdc (diff)