diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-04-14 17:44:45 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-04-15 09:20:31 +0200 |
| commit | 32e03a72339e9ffbbe27b0a0fde747dafc8568ee (patch) | |
| tree | 21d215df87cc494a238a03a10d1944b3b293e034 /src/qmltest | |
| parent | 0aa90fbd442d32d61d3fa8835865e86d91f19afa (diff) | |
Fix building Qt.test.qtestroot qmltypes with cmake
Change-Id: I94c08d3dbda94552437ae5c22278b0a57e0b96d9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/.prev_CMakeLists.txt | 23 | ||||
| -rw-r--r-- | src/qmltest/CMakeLists.txt | 31 |
2 files changed, 52 insertions, 2 deletions
diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt index db3f568a7b..e6d8a49d22 100644 --- a/src/qmltest/.prev_CMakeLists.txt +++ b/src/qmltest/.prev_CMakeLists.txt @@ -9,7 +9,7 @@ qt_add_module(QuickTest QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG} SOURCES qtestoptions_p.h - quicktest.cpp quicktest.h + quicktest.cpp quicktest.h quicktest_p.h quicktestglobal.h quicktestresult.cpp quicktestresult_p.h DEFINES @@ -31,6 +31,12 @@ qt_add_module(QuickTest #### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>: # MODULE_CONFIG = "$${QT.testlib.CONFIG}" +# QMLTYPES_FILENAME = "plugins.qmltypes" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/Qt/test/qtestroot" +# QML_IMPORT_NAME = "Qt.test.qtestroot" +# QML_IMPORT_VERSION = "1.0" +# qmldir.files = "$$PWD/qmldir" +# qmldir.path = "$$QMLTYPES_INSTALL_DIR" ## Scopes: ##################################################################### @@ -46,7 +52,22 @@ qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) + +#### Keys ignored in scope 4:.:.:qmltest.pro:prefix_build: +# INSTALLS = "qmldir" + +#### Keys ignored in scope 5:.:.:qmltest.pro:else: +# COPIES = "qmldir" qt_add_docs(QuickTest doc/qtqmltest.qdocconf ) + +set_target_properties(QuickTest PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 1.0 + QT_QML_MODULE_URI Qt.test.qtestroot + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/test/qtestroot" +) + +qt6_qml_type_registration(QuickTest) diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt index 4ad0d84928..c75deac6ad 100644 --- a/src/qmltest/CMakeLists.txt +++ b/src/qmltest/CMakeLists.txt @@ -9,7 +9,7 @@ qt_add_module(QuickTest QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG} SOURCES qtestoptions_p.h - quicktest.cpp quicktest.h + quicktest.cpp quicktest.h quicktest_p.h quicktestglobal.h quicktestresult.cpp quicktestresult_p.h DEFINES @@ -32,6 +32,12 @@ qt_add_module(QuickTest #### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>: # MODULE_CONFIG = "$${QT.testlib.CONFIG}" +# QMLTYPES_FILENAME = "plugins.qmltypes" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/Qt/test/qtestroot" +# QML_IMPORT_NAME = "Qt.test.qtestroot" +# QML_IMPORT_VERSION = "1.0" +# qmldir.files = "$$PWD/qmldir" +# qmldir.path = "$$QMLTYPES_INSTALL_DIR" ## Scopes: ##################################################################### @@ -47,7 +53,30 @@ qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) + +#### Keys ignored in scope 4:.:.:qmltest.pro:prefix_build: +# INSTALLS = "qmldir" + +#### Keys ignored in scope 5:.:.:qmltest.pro:else: +# COPIES = "qmldir" qt_add_docs(QuickTest doc/qtqmltest.qdocconf ) + +set_target_properties(QuickTest PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 1.0 + QT_QML_MODULE_URI Qt.test.qtestroot + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/test/qtestroot" +) + +qt6_qml_type_registration(QuickTest) + +#special case begin +if (QT_WILL_INSTALL) + install(FILES qmldir DESTINATION "${INSTALL_QMLDIR}/Qt/test/qtestroot") +else() + file(COPY qmldir DESTINATION "${QT_BUILD_DIR}/${INSTALL_QMLDIR}/Qt/test/qtestroot") +endif() +#special case end |