diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 14:09:06 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 15:51:40 +0200 |
| commit | 0f19f571ee307dbe5fdebeb489d0c6cfcc8fa5ef (patch) | |
| tree | 838ebcbebc0429dfeba724a1b052e577f5908b06 /tests/auto | |
| parent | 360a22838a9f6127702c35d9feb67560692df128 (diff) | |
CMake: Regenerate projects
We need the qt_add_tool changes to successfully configure qemu builds.
The rest of the changes are just to be in sync with the .pro files.
Change-Id: I7bcc08ac58f57a5761aedef09761428c55235289
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt | 37 | ||||
| -rw-r--r-- | tests/auto/qml/qmltyperegistrar/CMakeLists.txt | 3 |
3 files changed, 40 insertions, 3 deletions
diff --git a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt index 3c69aa04d4..5c3581a7e9 100644 --- a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt +++ b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt @@ -4,7 +4,8 @@ ## qjstest Tool: ##################################################################### -qt_add_tool(qjstest +qt_get_tool_target_name(target_name qjstest) +qt_add_tool(${target_name} TARGET_DESCRIPTION "Javascript test runner" SOURCES main.cpp diff --git a/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt new file mode 100644 index 0000000000..65272b0c7f --- /dev/null +++ b/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt @@ -0,0 +1,37 @@ +# Generated from qmltyperegistrar.pro. + +##################################################################### +## tst_qmltyperegistrar Test: +##################################################################### + +qt_add_test(tst_qmltyperegistrar + SOURCES + hppheader.hpp + noextheader + tst_qmltyperegistrar.cpp tst_qmltyperegistrar.h + INCLUDE_DIRECTORIES + foreign + PUBLIC_LIBRARIES + # Remove: Lforeign + Qt::Qml + foreign +) + +#### Keys ignored in scope 2:.:.:tst_qmltyperegistrar.pro:<TRUE>: +# QMLTYPES_FILENAME = "tst_qmltyperegistrar.qmltypes" +# QML_FOREIGN_METATYPES = "foreign/foreign_metatypes.json" +# QML_IMPORT_NAME = "QmlTypeRegistrarTest" +# QML_IMPORT_VERSION = "1.0" +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +set_target_properties(tst_qmltyperegistrar PROPERTIES + QT_QML_MODULE_VERSION 1.0 + QT_QML_MODULE_URI QmlTypeRegistrarTest + QT_QMLTYPES_FILENAME tst_qmltyperegistrar.qmltypes +) + +qt6_qml_type_registration(tst_qmltyperegistrar) +add_subdirectory(foreign) diff --git a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt index 4bef156880..4af6313c65 100644 --- a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt @@ -30,10 +30,9 @@ target_compile_definitions(tst_qmltyperegistrar PRIVATE BUILD_WITH_CMAKE) # spec ##################################################################### set_target_properties(tst_qmltyperegistrar PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI QmlTypeRegistrarTest - QT_QMLTYPES_FILENAME tst_qmltyperegistrar.qmltypes # special case + QT_QMLTYPES_FILENAME tst_qmltyperegistrar.qmltypes ) qt6_qml_type_registration(tst_qmltyperegistrar ${json_list}) # special case |