diff options
Diffstat (limited to 'tests/auto/qquickmaterialstyleconf/CMakeLists.txt')
-rw-r--r-- | tests/auto/qquickmaterialstyleconf/CMakeLists.txt | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt index 6c4b296a..fa0dde32 100644 --- a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt +++ b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qquickmaterialstyleconf +qt_add_test(tst_qquickmaterialstyleconf SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -18,20 +18,16 @@ add_qt_test(tst_qquickmaterialstyleconf tst_qquickmaterialstyleconf.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) @@ -42,7 +38,7 @@ set(qquickmaterialstyleconf_resource_files "variant-normal.conf" ) -add_qt_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf" +qt_add_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf" PREFIX "/" FILES @@ -56,12 +52,12 @@ add_qt_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf" ## Scopes: ##################################################################### -extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) |