diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-09 16:38:35 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-10 11:11:58 +0100 |
| commit | c1c4a874e31ba108a3600fbbb0aee7fc0bf34601 (patch) | |
| tree | 1d052689b20b41b80651d4314d55f7dde9462038 /tests/auto/qml | |
| parent | b6a164891537d6d3a515d78a44b0de6595a170c2 (diff) | |
CMake: Regenerate projects using pro2cmake one last time
And fix up some incorrect qmake project files
Pick-to: 6.0
Change-Id: Ia6d27ac68195635021fe7c4a5f06386a60f3f323
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/qml')
| -rw-r--r-- | tests/auto/qml/qmlimportscanner/.prev_CMakeLists.txt | 35 | ||||
| -rw-r--r-- | tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qmltyperegistrar/CMakeLists.txt | 3 |
3 files changed, 39 insertions, 1 deletions
diff --git a/tests/auto/qml/qmlimportscanner/.prev_CMakeLists.txt b/tests/auto/qml/qmlimportscanner/.prev_CMakeLists.txt new file mode 100644 index 0000000000..66231beccb --- /dev/null +++ b/tests/auto/qml/qmlimportscanner/.prev_CMakeLists.txt @@ -0,0 +1,35 @@ +# Generated from qmlimportscanner.pro. + +##################################################################### +## tst_qmlimportscanner Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + +qt_internal_add_test(tst_qmlimportscanner + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qmlimportscanner.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::Gui + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_internal_extend_target(tst_qmlimportscanner CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_internal_extend_target(tst_qmlimportscanner CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt index 9ee509cebb..adbe3c2c9e 100644 --- a/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt @@ -22,6 +22,7 @@ qt_internal_add_test(tst_qmltyperegistrar # QML_FOREIGN_METATYPES = "foreign/foreign_metatypes.json" # QML_IMPORT_NAME = "QmlTypeRegistrarTest" # QML_IMPORT_VERSION = "1.0" +# QML_PAST_MAJOR_VERSIONS = "0" # TEMPLATE = "app" ## Scopes: @@ -29,6 +30,7 @@ qt_internal_add_test(tst_qmltyperegistrar set_target_properties(tst_qmltyperegistrar PROPERTIES QT_QML_MODULE_VERSION 1.0 + QT_QML_PAST_MAJOR_VERSIONS 0 QT_QML_MODULE_URI QmlTypeRegistrarTest QT_QMLTYPES_FILENAME tst_qmltyperegistrar.qmltypes ) diff --git a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt index db8fa4b1d6..c12ef77ebb 100644 --- a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt @@ -24,6 +24,7 @@ target_compile_definitions(tst_qmltyperegistrar PRIVATE BUILD_WITH_CMAKE) # spec # QML_FOREIGN_METATYPES = "foreign/foreign_metatypes.json" # QML_IMPORT_NAME = "QmlTypeRegistrarTest" # QML_IMPORT_VERSION = "1.0" +# QML_PAST_MAJOR_VERSIONS = "0" # TEMPLATE = "app" ## Scopes: @@ -31,8 +32,8 @@ target_compile_definitions(tst_qmltyperegistrar PRIVATE BUILD_WITH_CMAKE) # spec set_target_properties(tst_qmltyperegistrar PROPERTIES QT_QML_MODULE_VERSION 1.0 + QT_QML_PAST_MAJOR_VERSIONS 0 QT_QML_MODULE_URI QmlTypeRegistrarTest - QT_QML_PAST_MAJOR_VERSIONS 0 # special case QT_QMLTYPES_FILENAME tst_qmltyperegistrar.qmltypes ) |