diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-23 11:27:31 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-25 15:36:24 +0200 |
| commit | b601c26c97d4f641060fc7588d6ac97c9f3d32e4 (patch) | |
| tree | ff6ef0f3f82fe7f6c7df21175ea37f4f423c6d69 /tests/auto/styleimportscompiletimematerial/CMakeLists.txt | |
| parent | 6b0618941a32067a0c5e1cfc9d8c40896657917e (diff) | |
CMake: Regenerate projects before API change
Task-number: QTBUG-86815
Change-Id: Ie0688d13b1787da3c1fc241a7d864aa014ca1d70
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/styleimportscompiletimematerial/CMakeLists.txt')
| -rw-r--r-- | tests/auto/styleimportscompiletimematerial/CMakeLists.txt | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/tests/auto/styleimportscompiletimematerial/CMakeLists.txt b/tests/auto/styleimportscompiletimematerial/CMakeLists.txt index b5910e92..af167d0c 100644 --- a/tests/auto/styleimportscompiletimematerial/CMakeLists.txt +++ b/tests/auto/styleimportscompiletimematerial/CMakeLists.txt @@ -1,7 +1,7 @@ -# Generated from styleimports.pro. +# Generated from styleimportscompiletimematerial.pro. ##################################################################### -## tst_styleimports Test: +## tst_styleimportscompiletimematerial Test: ##################################################################### # Collect test data @@ -10,12 +10,12 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_styleimports +qt_add_test(tst_styleimportscompiletimematerial SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h ../shared/visualtestutil.cpp ../shared/visualtestutil.h - tst_styleimports.cpp + tst_styleimportscompiletimematerial.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" PUBLIC_LIBRARIES @@ -31,32 +31,18 @@ qt_add_test(tst_styleimports TESTDATA ${test_data} ) -# Resources: -set(qmake_resourcestyle_resource_files - "ResourceStyle/Button.qml" - "ResourceStyle/qmldir" -) - -qt_add_resource(tst_styleimports "qmake_resourcestyle" - PREFIX - "/" - FILES - ${qmake_resourcestyle_resource_files} -) - - -#### Keys ignored in scope 1:.:.:styleimports.pro:<TRUE>: -# OTHER_FILES = "data/*.qml" "data/qmldir" "data/FileSystemStyle/*.qml" "data/FileSystemStyle/qmldir" "data/PlatformStyle/*.qml" "data/PlatformStyle/+linux/*.qml" "data/PlatformStyle/+macos/*.qml" "data/PlatformStyle/+windows/*.qml" "data/PlatformStyle/qmldir" +#### Keys ignored in scope 1:.:.:styleimportscompiletimematerial.pro:<TRUE>: +# OTHER_FILES = "data/*.qml" ## Scopes: ##################################################################### -qt_extend_target(tst_styleimports CONDITION ANDROID OR IOS +qt_extend_target(tst_styleimportscompiletimematerial CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS +qt_extend_target(tst_styleimportscompiletimematerial CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) |