aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/pointerhandlers
diff options
context:
space:
mode:
authorTor Arne Vestbø <torarnv@gmail.com>2020-03-16 14:10:44 +0100
committerTor Arne Vestbø <torarnv@gmail.com>2020-03-17 10:42:00 +0100
commita5df29201fb795503635ddaae787ade5b96bff5e (patch)
tree340a4d8021ce04a58e7252a03c33b6732caee942 /tests/auto/quick/pointerhandlers
parentdb554e8e1c3242634d035ebb3dcbe3c441d80bdc (diff)
CMake: Update Apple platform defines after rename in qtbase
Change-Id: Ia0a075e3199eab735f9b289873beeb8730ebc47e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/quick/pointerhandlers')
-rw-r--r--tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt4
-rw-r--r--tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt4
-rw-r--r--tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt4
-rw-r--r--tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt4
-rw-r--r--tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt4
-rw-r--r--tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt4
-rw-r--r--tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt4
-rw-r--r--tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt4
-rw-r--r--tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt4
9 files changed, 18 insertions, 18 deletions
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\\\"
)