diff options
| author | Andrei Golubev <andrei.golubev@qt.io> | 2022-05-24 13:10:26 +0200 |
|---|---|---|
| committer | Andrei Golubev <andrei.golubev@qt.io> | 2022-05-31 17:23:09 +0200 |
| commit | 86fae5664cbcaf9e6f98eca984564e5452730abd (patch) | |
| tree | c5bea65da2a07ae6fab093aa4076741964b788d9 /tests | |
| parent | 375a55d019d16afde1e611a9ac0d399887821400 (diff) | |
Remove qmltc compilation command in favor of qt_add_qml_module()
[ChangeLog][CMake] The qmltc compilation functionality provided by
qt6_target_compile_qml_to_cpp() is merged into qt6_add_qml_module()
command and is available through ENABLE_TYPE_COMPILER argument. The
qt6_target_compile_qml_to_cpp() function does nothing and is left
only to highlight that users must migrate away from it.
Fixes: QTBUG-100215
Change-Id: Ie7d6b82564dff86176194fce35039ba0d93c0977
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/qmltc/data/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | tests/auto/qml/qmltc/data/badFile.qml | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/auto/qml/qmltc/data/CMakeLists.txt b/tests/auto/qml/qmltc/data/CMakeLists.txt index 49856a86b5..395463aabe 100644 --- a/tests/auto/qml/qmltc/data/CMakeLists.txt +++ b/tests/auto/qml/qmltc/data/CMakeLists.txt @@ -82,6 +82,8 @@ set(qml_sources LocalWithOnCompleted.qml LocallyImported_context.qml # SingletonThing.qml + + badFile.qml ) set(js_sources @@ -99,6 +101,8 @@ set(common_libraries set_source_files_properties(NameConflict.qml PROPERTIES QT_QMLTC_FILE_BASENAME ResolvedNameConflict) +set_source_files_properties(badFile.qml PROPERTIES QT_QML_SKIP_TYPE_COMPILER TRUE) + # set_source_files_properties(SingletonThing.qml PROPERTIES # QT_QML_SINGLETON_TYPE true) @@ -119,11 +123,8 @@ qt6_add_qml_module(qmltc_test_module ${js_sources} DEPENDENCIES QtQuick -) -qt_internal_target_compile_qml_to_cpp(qmltc_test_module - NAMESPACE QmltcTest - QML_FILES - ${qml_sources} + ENABLE_TYPE_COMPILER + TYPE_COMPILER_NAMESPACE QmltcTest ) qt_autogen_tools_initial_setup(qmltc_test_moduleplugin) diff --git a/tests/auto/qml/qmltc/data/badFile.qml b/tests/auto/qml/qmltc/data/badFile.qml new file mode 100644 index 0000000000..d041a3b5e5 --- /dev/null +++ b/tests/auto/qml/qmltc/data/badFile.qml @@ -0,0 +1 @@ +UnknownType {} |