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/styleimports | |
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/styleimports')
-rw-r--r-- | tests/auto/styleimports/.prev_CMakeLists.txt | 65 | ||||
-rw-r--r-- | tests/auto/styleimports/CMakeLists.txt | 4 |
2 files changed, 65 insertions, 4 deletions
diff --git a/tests/auto/styleimports/.prev_CMakeLists.txt b/tests/auto/styleimports/.prev_CMakeLists.txt new file mode 100644 index 00000000..108a2054 --- /dev/null +++ b/tests/auto/styleimports/.prev_CMakeLists.txt @@ -0,0 +1,65 @@ +# Generated from styleimports.pro. + +##################################################################### +## tst_styleimports Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + +qt_add_test(tst_styleimports + SOURCES + ../shared/qtest_quickcontrols.h + ../shared/util.cpp ../shared/util.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_styleimports.cpp + DEFINES + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickControls2 + Qt::QuickControls2ImplPrivate + Qt::QuickControls2Private + Qt::QuickPrivate + Qt::QuickTemplates2Private + Qt::TestPrivate + TESTDATA ${test_data} +) + +# Resources: +set(qmake_resourcestyle_resource_files + "resources/ResourceStyle/Button.qml" + "resources/ResourceStyle/qmldir" +) + +qt_add_resource(tst_styleimports "qmake_resourcestyle" + PREFIX + "/" + BASE + "resources" + 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" + +## Scopes: +##################################################################### + +qt_extend_target(tst_styleimports CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/styleimports/CMakeLists.txt b/tests/auto/styleimports/CMakeLists.txt index 86db761a..27ba24e7 100644 --- a/tests/auto/styleimports/CMakeLists.txt +++ b/tests/auto/styleimports/CMakeLists.txt @@ -34,10 +34,6 @@ qt_add_test(tst_styleimports # Resources: set(qmake_resourcestyle_resource_files - "resources/ResourceStyle/Button.qml" - "resources/ResourceStyle/qmldir" -) -set(qmake_resourcestyle_resource_files "ResourceStyle/Button.qml" # special case: QTBUG-86726 "ResourceStyle/qmldir" # special case ) |