From a5df29201fb795503635ddaae787ade5b96bff5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 16 Mar 2020 14:10:44 +0100 Subject: CMake: Update Apple platform defines after rename in qtbase Change-Id: Ia0a075e3199eab735f9b289873beeb8730ebc47e Reviewed-by: Simon Hausmann --- tests/auto/quicktest/polish-qml/CMakeLists.txt | 4 ++-- tests/auto/quicktest/polish/CMakeLists.txt | 4 ++-- tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt | 4 ++-- tests/auto/quicktest/signalspy/CMakeLists.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/auto/quicktest') 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\\\" ) -- cgit v1.2.3