diff options
27 files changed, 55 insertions, 43 deletions
diff --git a/.cmake.conf b/.cmake.conf new file mode 100644 index 0000000000..9305480451 --- /dev/null +++ b/.cmake.conf @@ -0,0 +1 @@ +set(QT_REPO_MODULE_VERSION "6.0.0") diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt index 9117c6e684..e2f6ce0f63 100644 --- a/.prev_CMakeLists.txt +++ b/.prev_CMakeLists.txt @@ -2,8 +2,9 @@ cmake_minimum_required(VERSION 3.15.0) +include(.cmake.conf) project(declarative_FIXME - VERSION 6.0.0 + VERSION "${QT_REPO_MODULE_VERSION}" DESCRIPTION "Qt declarative_FIXME Libraries" HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C diff --git a/CMakeLists.txt b/CMakeLists.txt index 3198a5f935..aad689a5a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,9 @@ cmake_minimum_required(VERSION 3.15.0) +include(.cmake.conf) project(QtDeclarative # special case - VERSION 6.0.0 + VERSION "${QT_REPO_MODULE_VERSION}" DESCRIPTION "Qt Declarative Libraries" # special case HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt index 9265da61ab..4f3ed5daf4 100644 --- a/src/particles/CMakeLists.txt +++ b/src/particles/CMakeLists.txt @@ -130,6 +130,7 @@ set_target_properties(QuickParticles PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQuick.Particles + QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Particles" ) diff --git a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt index 7f42437e82..de3f663d09 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt @@ -4,7 +4,7 @@ ## QQmlDebuggerServiceFactory Plugin: ##################################################################### -qt_add_plugin(QQmlDebuggerServiceFactory +qt_internal_add_plugin(QQmlDebuggerServiceFactory OUTPUT_NAME qmldbg_debugger TYPE qmltooling SOURCES diff --git a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt index 4e2b41c67b..da79890824 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt @@ -4,7 +4,7 @@ ## QQmlInspectorServiceFactory Plugin: ##################################################################### -qt_add_plugin(QQmlInspectorServiceFactory +qt_internal_add_plugin(QQmlInspectorServiceFactory OUTPUT_NAME qmldbg_inspector TYPE qmltooling SOURCES diff --git a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt index 32cb329cc2..faeef01111 100644 --- a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt @@ -4,7 +4,7 @@ ## QLocalClientConnectionFactory Plugin: ##################################################################### -qt_add_plugin(QLocalClientConnectionFactory +qt_internal_add_plugin(QLocalClientConnectionFactory OUTPUT_NAME qmldbg_local TYPE qmltooling SOURCES diff --git a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt index 83bfbe1c37..7785a4c8ed 100644 --- a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt @@ -4,7 +4,7 @@ ## QDebugMessageServiceFactory Plugin: ##################################################################### -qt_add_plugin(QDebugMessageServiceFactory +qt_internal_add_plugin(QDebugMessageServiceFactory OUTPUT_NAME qmldbg_messages TYPE qmltooling SOURCES diff --git a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt index 844c35ae4b..37447f593a 100644 --- a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt @@ -4,7 +4,7 @@ ## QQmlNativeDebugConnectorFactory Plugin: ##################################################################### -qt_add_plugin(QQmlNativeDebugConnectorFactory +qt_internal_add_plugin(QQmlNativeDebugConnectorFactory OUTPUT_NAME qmldbg_native TYPE qmltooling SOURCES diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt index 62aa1399e0..b26b66ec6b 100644 --- a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt @@ -4,7 +4,7 @@ ## QQmlNativeDebugServiceFactory Plugin: ##################################################################### -qt_add_plugin(QQmlNativeDebugServiceFactory +qt_internal_add_plugin(QQmlNativeDebugServiceFactory OUTPUT_NAME qmldbg_nativedebugger TYPE qmltooling SOURCES diff --git a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt index 908fd961fe..2874580a03 100644 --- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt @@ -4,7 +4,7 @@ ## QQmlPreviewServiceFactory Plugin: ##################################################################### -qt_add_plugin(QQmlPreviewServiceFactory +qt_internal_add_plugin(QQmlPreviewServiceFactory OUTPUT_NAME qmldbg_preview TYPE qmltooling SOURCES diff --git a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt index b1ff256a1a..ac1bf3fe69 100644 --- a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt @@ -4,7 +4,7 @@ ## QQmlProfilerServiceFactory Plugin: ##################################################################### -qt_add_plugin(QQmlProfilerServiceFactory +qt_internal_add_plugin(QQmlProfilerServiceFactory OUTPUT_NAME qmldbg_profiler TYPE qmltooling SOURCES diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt index e67deee569..a7a346eeef 100644 --- a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt @@ -4,7 +4,7 @@ ## QQuickProfilerAdapterFactory Plugin: ##################################################################### -qt_add_plugin(QQuickProfilerAdapterFactory +qt_internal_add_plugin(QQuickProfilerAdapterFactory OUTPUT_NAME qmldbg_quickprofiler TYPE qmltooling SOURCES diff --git a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt index 58a8b9506b..490be0be7c 100644 --- a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt @@ -4,7 +4,7 @@ ## QQmlDebugServerFactory Plugin: ##################################################################### -qt_add_plugin(QQmlDebugServerFactory +qt_internal_add_plugin(QQmlDebugServerFactory OUTPUT_NAME qmldbg_server TYPE qmltooling SOURCES diff --git a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt index 0c9afa852f..5fc079ea4a 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt @@ -4,7 +4,7 @@ ## QTcpServerConnectionFactory Plugin: ##################################################################### -qt_add_plugin(QTcpServerConnectionFactory +qt_internal_add_plugin(QTcpServerConnectionFactory OUTPUT_NAME qmldbg_tcp TYPE qmltooling SOURCES diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt index 3acfa066f4..a46c66cfaa 100644 --- a/src/plugins/scenegraph/openvg/CMakeLists.txt +++ b/src/plugins/scenegraph/openvg/CMakeLists.txt @@ -4,9 +4,11 @@ ## QSGOpenVGAdaptation Plugin: ##################################################################### -qt_add_plugin(QSGOpenVGAdaptation +qt_internal_add_plugin(QSGOpenVGAdaptation OUTPUT_NAME qsgopenvgbackend TYPE scenegraph + TARGET_PRODUCT "Qt Quick OpenVG Renderer (Qt $$QT_VERSION)" + TARGET_DESCRIPTION "Quick OpenVG Renderer for Qt." SOURCES qopenvgcontext.cpp qopenvgcontext_p.h qopenvgmatrix.cpp qopenvgmatrix.h diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index 90cb65a95c..e71d9abaa0 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -363,7 +363,7 @@ qt_extend_target(Qml CONDITION WIN32 AND NOT WINRT shell32 ) -#### Keys ignored in scope 6:.:.:qml.pro:solaris-cc_x_: +#### Keys ignored in scope 7:.:.:qml.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" qt_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips") @@ -385,10 +385,10 @@ qt_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 1 -d2SSAOptimizer- ) -#### Keys ignored in scope 10:.:.:qml.pro:ICC: +#### Keys ignored in scope 11:.:.:qml.pro:ICC: # WERROR = "-ww2415" -#### Keys ignored in scope 11:.:.:qml.pro:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ): +#### Keys ignored in scope 12:.:.:qml.pro:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ): # WERROR = "-Wno-error=unused-const-variable" qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit @@ -415,19 +415,19 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation animations ) -#### Keys ignored in scope 17:.:common:common/common.pri:NOT build_pass: +#### Keys ignored in scope 18:.:common:common/common.pri:NOT build_pass: # compile_hash_contents = "// Generated file, DO NOT EDIT" "$${LITERAL_HASH}define QML_COMPILE_HASH "$$QML_COMPILE_HASH"" "$${LITERAL_HASH}define QML_COMPILE_HASH_LENGTH $$str_size($$QML_COMPILE_HASH)" # tag = <EMPTY> # tagFile = "$$PWD/../../.tag" -#### Keys ignored in scope 18:.:common:common/common.pri:EXISTS _ss_tagFile: +#### Keys ignored in scope 19:.:common:common/common.pri:EXISTS _ss_tagFile: # QMAKE_INTERNAL_INCLUDED_FILES = "$$tagFile" # tag = "$$cat($$tagFile, singleline)" -#### Keys ignored in scope 19:.:common:common/common.pri:NOT tag___equals____ss_{LITERAL_DOLLAR}Format AND %H_ss_{LITERAL_DOLLAR}: +#### Keys ignored in scope 20:.:common:common/common.pri:NOT tag___equals____ss_{LITERAL_DOLLAR}Format AND %H_ss_{LITERAL_DOLLAR}: # QML_COMPILE_HASH = "$$tag" -#### Keys ignored in scope 21:.:common:common/common.pri:EXISTS _ss_PWD/../../.git: +#### Keys ignored in scope 22:.:common:common/common.pri:EXISTS _ss_PWD/../../.git: # QML_COMPILE_HASH = "$$commit" # commit = "$$system(git rev-parse HEAD)" @@ -551,7 +551,7 @@ qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AN -Wno-expansion-to-defined ) -#### Keys ignored in scope 65:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6): +#### Keys ignored in scope 66:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6): # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined" qt_extend_target(Qml CONDITION WINRT @@ -580,21 +580,21 @@ qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1 ../3rdparty/masm/disassembler/udis86/udis86_syn-intel.c ) -#### Keys ignored in scope 73:.:../3rdparty/masm:../3rdparty/masm/masm.pri:DEFINES___contains___WTF_USE_UDIS86=1: +#### Keys ignored in scope 74:.:../3rdparty/masm:../3rdparty/masm/masm.pri:DEFINES___contains___WTF_USE_UDIS86=1: # ITAB = "$$PWD/disassembler/udis86/optable.xml" # QMAKE_EXTRA_COMPILERS = "udis86" # QMAKE_EXTRA_TARGETS = "udis86_tab_cfile" # udis86.CONFIG = "no_link" -# udis86.commands = "python" "$$PWD/disassembler/udis86/itab.py" "${QMAKE_FILE_IN}" +# udis86.commands = "$QMAKE_PYTHON" "$$PWD/disassembler/udis86/itab.py" "${QMAKE_FILE_IN}" # udis86.input = "ITAB" # udis86.output = "udis86_itab.h" # udis86_tab_cfile.depends = "udis86_itab.h" # udis86_tab_cfile.target = "$$OUT_PWD/udis86_itab.c" -#### Keys ignored in scope 75:.:../3rdparty/masm:../3rdparty/masm/masm.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): +#### Keys ignored in scope 76:.:../3rdparty/masm:../3rdparty/masm/masm.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): # GENERATEDDIR = "$$GENERATEDDIR/debug" -#### Keys ignored in scope 76:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else: +#### Keys ignored in scope 77:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else: # GENERATEDDIR = "$$GENERATEDDIR/release" qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG) @@ -619,6 +619,7 @@ set_target_properties(Qml PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml + QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml" ) diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index ecab712a47..527a5f4914 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -370,7 +370,7 @@ qt_extend_target(Qml CONDITION WIN32 AND NOT WINRT shell32 ) -#### Keys ignored in scope 6:.:.:qml.pro:solaris-cc_x_: +#### Keys ignored in scope 7:.:.:qml.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" qt_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips") @@ -392,10 +392,10 @@ qt_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 1 -d2SSAOptimizer- ) -#### Keys ignored in scope 10:.:.:qml.pro:ICC: +#### Keys ignored in scope 11:.:.:qml.pro:ICC: # WERROR = "-ww2415" -#### Keys ignored in scope 11:.:.:qml.pro:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ): +#### Keys ignored in scope 12:.:.:qml.pro:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ): # WERROR = "-Wno-error=unused-const-variable" qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit @@ -422,19 +422,19 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation animations ) -#### Keys ignored in scope 17:.:common:common/common.pri:NOT build_pass: +#### Keys ignored in scope 18:.:common:common/common.pri:NOT build_pass: # compile_hash_contents = "// Generated file, DO NOT EDIT" "$${LITERAL_HASH}define QML_COMPILE_HASH "$$QML_COMPILE_HASH"" "$${LITERAL_HASH}define QML_COMPILE_HASH_LENGTH $$str_size($$QML_COMPILE_HASH)" # tag = <EMPTY> # tagFile = "$$PWD/../../.tag" -#### Keys ignored in scope 18:.:common:common/common.pri:EXISTS _ss_tagFile: +#### Keys ignored in scope 19:.:common:common/common.pri:EXISTS _ss_tagFile: # QMAKE_INTERNAL_INCLUDED_FILES = "$$tagFile" # tag = "$$cat($$tagFile, singleline)" -#### Keys ignored in scope 19:.:common:common/common.pri:NOT tag___equals____ss_{LITERAL_DOLLAR}Format AND %H_ss_{LITERAL_DOLLAR}: +#### Keys ignored in scope 20:.:common:common/common.pri:NOT tag___equals____ss_{LITERAL_DOLLAR}Format AND %H_ss_{LITERAL_DOLLAR}: # QML_COMPILE_HASH = "$$tag" -#### Keys ignored in scope 21:.:common:common/common.pri:EXISTS _ss_PWD/../../.git: +#### Keys ignored in scope 22:.:common:common/common.pri:EXISTS _ss_PWD/../../.git: # QML_COMPILE_HASH = "$$commit" # commit = "$$system(git rev-parse HEAD)" @@ -558,7 +558,7 @@ qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AN -Wno-expansion-to-defined ) -#### Keys ignored in scope 65:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6): +#### Keys ignored in scope 66:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6): # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined" qt_extend_target(Qml CONDITION WINRT @@ -587,21 +587,21 @@ qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1 ../3rdparty/masm/disassembler/udis86/udis86_syn-intel.c ) -#### Keys ignored in scope 73:.:../3rdparty/masm:../3rdparty/masm/masm.pri:DEFINES___contains___WTF_USE_UDIS86=1: +#### Keys ignored in scope 74:.:../3rdparty/masm:../3rdparty/masm/masm.pri:DEFINES___contains___WTF_USE_UDIS86=1: # ITAB = "$$PWD/disassembler/udis86/optable.xml" # QMAKE_EXTRA_COMPILERS = "udis86" # QMAKE_EXTRA_TARGETS = "udis86_tab_cfile" # udis86.CONFIG = "no_link" -# udis86.commands = "python" "$$PWD/disassembler/udis86/itab.py" "${QMAKE_FILE_IN}" +# udis86.commands = "$QMAKE_PYTHON" "$$PWD/disassembler/udis86/itab.py" "${QMAKE_FILE_IN}" # udis86.input = "ITAB" # udis86.output = "udis86_itab.h" # udis86_tab_cfile.depends = "udis86_itab.h" # udis86_tab_cfile.target = "$$OUT_PWD/udis86_itab.c" -#### Keys ignored in scope 75:.:../3rdparty/masm:../3rdparty/masm/masm.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): +#### Keys ignored in scope 76:.:../3rdparty/masm:../3rdparty/masm/masm.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): # GENERATEDDIR = "$$GENERATEDDIR/debug" -#### Keys ignored in scope 76:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else: +#### Keys ignored in scope 77:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else: # GENERATEDDIR = "$$GENERATEDDIR/release" qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG) @@ -626,8 +626,8 @@ set_target_properties(Qml PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml + QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml" - QT_QMLTYPES_FILENAME "plugins.qmltypes" ) qt6_qml_type_registration(Qml) diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt index 083807dd31..e4d3903b4f 100644 --- a/src/qmlmodels/CMakeLists.txt +++ b/src/qmlmodels/CMakeLists.txt @@ -72,8 +72,8 @@ set_target_properties(QmlModels PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml.Models + QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/Models" - QT_QMLTYPES_FILENAME "plugins.qmltypes" ) qt6_qml_type_registration(QmlModels) diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt index e6d8a49d22..33e7bcbaab 100644 --- a/src/qmltest/.prev_CMakeLists.txt +++ b/src/qmltest/.prev_CMakeLists.txt @@ -67,6 +67,7 @@ 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_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/test/qtestroot" ) diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt index ad2e5bcded..9e7d76fff8 100644 --- a/src/qmltest/CMakeLists.txt +++ b/src/qmltest/CMakeLists.txt @@ -68,8 +68,8 @@ 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_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/test/qtestroot" - QT_QMLTYPES_FILENAME "plugins.qmltypes" ) qt6_qml_type_registration(QuickTest) diff --git a/src/qmltyperegistrar/.prev_CMakeLists.txt b/src/qmltyperegistrar/.prev_CMakeLists.txt index c82a0e5a99..5809054824 100644 --- a/src/qmltyperegistrar/.prev_CMakeLists.txt +++ b/src/qmltyperegistrar/.prev_CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_add_tool(qmltyperegistrar + TARGET_DESCRIPTION "QML Types Registrar" SOURCES ../../tools/shared/qmlstreamwriter.cpp ../../tools/shared/qmlstreamwriter.h qmltyperegistrar.cpp diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt index 487c31d613..f7f68bf3dd 100644 --- a/src/qmltyperegistrar/CMakeLists.txt +++ b/src/qmltyperegistrar/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_add_tool(qmltyperegistrar + TARGET_DESCRIPTION "QML Types Registrar" TOOLS_TARGET Qml # special case SOURCES ../../tools/shared/qmlstreamwriter.cpp ../../tools/shared/qmlstreamwriter.h diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt index ad1a578f14..0ce8a06c72 100644 --- a/src/qmlworkerscript/.prev_CMakeLists.txt +++ b/src/qmlworkerscript/.prev_CMakeLists.txt @@ -108,6 +108,7 @@ set_target_properties(QmlWorkerScript PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml.WorkerScript + QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" ) diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index 828974ee45..36e2b0dc68 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -108,8 +108,8 @@ set_target_properties(QmlWorkerScript PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml.WorkerScript + QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" - QT_QMLTYPES_FILENAME "plugins.qmltypes" ) qt6_qml_type_registration(QmlWorkerScript) diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 26a7d13100..a8c8aa378c 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -615,8 +615,8 @@ set_target_properties(Quick PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQuick + QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick" - QT_QMLTYPES_FILENAME "plugins.qmltypes" ) qt6_qml_type_registration(Quick) diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt index 3287fb1dd5..b8a37288f0 100644 --- a/src/quickshapes/CMakeLists.txt +++ b/src/quickshapes/CMakeLists.txt @@ -74,6 +74,7 @@ set_target_properties(QuickShapes PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQuick.Shapes + QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Shapes" ) |