diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-07-14 23:46:18 +1000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-20 08:37:41 +0000 |
| commit | 2f02f108d918d8e43027ed9d04690439d1761839 (patch) | |
| tree | aa787b1ee18d32a28c959468c9754e25d86afe79 /tests | |
| parent | ec8c37ee527bfad072ccfa9aec1dbb0e54259e44 (diff) | |
CMake: Remove OUTPUT_DIRECTORY option from qt6_qml_type_registration()
The output directory is already recorded on the target passed to the
command, so use that target property instead.
Task-number: QTBUG-94164
Change-Id: I80fe3975338480aa5f3bc2f01443811e0b4c45bc
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit f6f767bd9fe01816e3dfe7f1e662eac77e460bbf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/qmltyperegistrar/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt index 674dc08056..dfd404575b 100644 --- a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt +++ b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt @@ -33,12 +33,16 @@ qt_internal_add_test(tst_qmltyperegistrar ## Scopes: ##################################################################### +# Simulate conditions that qt6_add_qml_module() would normally set up for us 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 + QT_QML_MODULE_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} ) -qt6_qml_type_registration(tst_qmltyperegistrar MANUAL_MOC_JSON_FILES ${json_list}) # special case +# qt6_add_qml_module() doesn't allow us to pass through MANUAL_MOC_JSON_FILES +# yet, so we have to call it directly to test that code path for now. +qt6_qml_type_registration(tst_qmltyperegistrar MANUAL_MOC_JSON_FILES ${json_list}) add_subdirectory(foreign) |