qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: Regenerate qtdeclarative/src 

Includes
 - renaming of internal plugin api call
 - generation of QT_QMLTYPES_FILENAME
 - addition of a few TARGET_DESCRIPTION

Change-Id: I72b5647b8c16af9945795ead62a075322b6bb2f6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-05-28 16:34:22 +02:00
parent 8a4dec618f
commit 25ae2045b6
27 changed files with 55 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cmake.conf Normal file
View File

@ -0,0 +1 @@
set(QT_REPO_MODULE_VERSION "6.0.0")

3
.prev_CMakeLists.txt
View File

@ -2,8 +2,9 @@
cmake_minimum_required(VERSION 3.15.0) cmake_minimum_required(VERSION 3.15.0)
include(.cmake.conf)
project(declarative_FIXME project(declarative_FIXME
VERSION 6.0.0 VERSION "${QT_REPO_MODULE_VERSION}"
DESCRIPTION "Qt declarative_FIXME Libraries" DESCRIPTION "Qt declarative_FIXME Libraries"
HOMEPAGE_URL "https://qt.io/" HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C LANGUAGES CXX C

3
CMakeLists.txt
View File

@ -2,8 +2,9 @@
cmake_minimum_required(VERSION 3.15.0) cmake_minimum_required(VERSION 3.15.0)
include(.cmake.conf)
project(QtDeclarative # special case project(QtDeclarative # special case
VERSION 6.0.0 VERSION "${QT_REPO_MODULE_VERSION}"
DESCRIPTION "Qt Declarative Libraries" # special case DESCRIPTION "Qt Declarative Libraries" # special case
HOMEPAGE_URL "https://qt.io/" HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C LANGUAGES CXX C

1
src/particles/CMakeLists.txt
View File

@ -130,6 +130,7 @@ set_target_properties(QuickParticles PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
QT_QML_MODULE_URI QtQuick.Particles QT_QML_MODULE_URI QtQuick.Particles
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Particles" QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Particles"
) )

2
src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QQmlDebuggerServiceFactory Plugin: ## QQmlDebuggerServiceFactory Plugin:
##################################################################### #####################################################################
qt_add_plugin(QQmlDebuggerServiceFactory qt_internal_add_plugin(QQmlDebuggerServiceFactory
OUTPUT_NAME qmldbg_debugger OUTPUT_NAME qmldbg_debugger
TYPE qmltooling TYPE qmltooling
SOURCES SOURCES

2
src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QQmlInspectorServiceFactory Plugin: ## QQmlInspectorServiceFactory Plugin:
##################################################################### #####################################################################
qt_add_plugin(QQmlInspectorServiceFactory qt_internal_add_plugin(QQmlInspectorServiceFactory
OUTPUT_NAME qmldbg_inspector OUTPUT_NAME qmldbg_inspector
TYPE qmltooling TYPE qmltooling
SOURCES SOURCES

2
src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QLocalClientConnectionFactory Plugin: ## QLocalClientConnectionFactory Plugin:
##################################################################### #####################################################################
qt_add_plugin(QLocalClientConnectionFactory qt_internal_add_plugin(QLocalClientConnectionFactory
OUTPUT_NAME qmldbg_local OUTPUT_NAME qmldbg_local
TYPE qmltooling TYPE qmltooling
SOURCES SOURCES

2
src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QDebugMessageServiceFactory Plugin: ## QDebugMessageServiceFactory Plugin:
##################################################################### #####################################################################
qt_add_plugin(QDebugMessageServiceFactory qt_internal_add_plugin(QDebugMessageServiceFactory
OUTPUT_NAME qmldbg_messages OUTPUT_NAME qmldbg_messages
TYPE qmltooling TYPE qmltooling
SOURCES SOURCES

2
src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QQmlNativeDebugConnectorFactory Plugin: ## QQmlNativeDebugConnectorFactory Plugin:
##################################################################### #####################################################################
qt_add_plugin(QQmlNativeDebugConnectorFactory qt_internal_add_plugin(QQmlNativeDebugConnectorFactory
OUTPUT_NAME qmldbg_native OUTPUT_NAME qmldbg_native
TYPE qmltooling TYPE qmltooling
SOURCES SOURCES

2
src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QQmlNativeDebugServiceFactory Plugin: ## QQmlNativeDebugServiceFactory Plugin:
##################################################################### #####################################################################
qt_add_plugin(QQmlNativeDebugServiceFactory qt_internal_add_plugin(QQmlNativeDebugServiceFactory
OUTPUT_NAME qmldbg_nativedebugger OUTPUT_NAME qmldbg_nativedebugger
TYPE qmltooling TYPE qmltooling
SOURCES SOURCES

2
src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QQmlPreviewServiceFactory Plugin: ## QQmlPreviewServiceFactory Plugin:
##################################################################### #####################################################################
qt_add_plugin(QQmlPreviewServiceFactory qt_internal_add_plugin(QQmlPreviewServiceFactory
OUTPUT_NAME qmldbg_preview OUTPUT_NAME qmldbg_preview
TYPE qmltooling TYPE qmltooling
SOURCES SOURCES

2
src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QQmlProfilerServiceFactory Plugin: ## QQmlProfilerServiceFactory Plugin:
##################################################################### #####################################################################
qt_add_plugin(QQmlProfilerServiceFactory qt_internal_add_plugin(QQmlProfilerServiceFactory
OUTPUT_NAME qmldbg_profiler OUTPUT_NAME qmldbg_profiler
TYPE qmltooling TYPE qmltooling
SOURCES SOURCES

2
src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QQuickProfilerAdapterFactory Plugin: ## QQuickProfilerAdapterFactory Plugin:
##################################################################### #####################################################################
qt_add_plugin(QQuickProfilerAdapterFactory qt_internal_add_plugin(QQuickProfilerAdapterFactory
OUTPUT_NAME qmldbg_quickprofiler OUTPUT_NAME qmldbg_quickprofiler
TYPE qmltooling TYPE qmltooling
SOURCES SOURCES

2
src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QQmlDebugServerFactory Plugin: ## QQmlDebugServerFactory Plugin:
##################################################################### #####################################################################
qt_add_plugin(QQmlDebugServerFactory qt_internal_add_plugin(QQmlDebugServerFactory
OUTPUT_NAME qmldbg_server OUTPUT_NAME qmldbg_server
TYPE qmltooling TYPE qmltooling
SOURCES SOURCES

2
src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QTcpServerConnectionFactory Plugin: ## QTcpServerConnectionFactory Plugin:
##################################################################### #####################################################################
qt_add_plugin(QTcpServerConnectionFactory qt_internal_add_plugin(QTcpServerConnectionFactory
OUTPUT_NAME qmldbg_tcp OUTPUT_NAME qmldbg_tcp
TYPE qmltooling TYPE qmltooling
SOURCES SOURCES

4
src/plugins/scenegraph/openvg/CMakeLists.txt
View File

@ -4,9 +4,11 @@
## QSGOpenVGAdaptation Plugin: ## QSGOpenVGAdaptation Plugin:
##################################################################### #####################################################################
qt_add_plugin(QSGOpenVGAdaptation qt_internal_add_plugin(QSGOpenVGAdaptation
OUTPUT_NAME qsgopenvgbackend OUTPUT_NAME qsgopenvgbackend
TYPE scenegraph TYPE scenegraph
TARGET_PRODUCT "Qt Quick OpenVG Renderer (Qt $$QT_VERSION)"
TARGET_DESCRIPTION "Quick OpenVG Renderer for Qt."
SOURCES SOURCES
qopenvgcontext.cpp qopenvgcontext_p.h qopenvgcontext.cpp qopenvgcontext_p.h
qopenvgmatrix.cpp qopenvgmatrix.h qopenvgmatrix.cpp qopenvgmatrix.h

25
src/qml/.prev_CMakeLists.txt
View File

@ -363,7 +363,7 @@ qt_extend_target(Qml CONDITION WIN32 AND NOT WINRT
shell32 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" # QMAKE_CXXFLAGS_RELEASE = "--O2"
qt_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips") 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- -d2SSAOptimizer-
) )
#### Keys ignored in scope 10:.:.:qml.pro:ICC: #### Keys ignored in scope 11:.:.:qml.pro:ICC:
# WERROR = "-ww2415" # 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" # WERROR = "-Wno-error=unused-const-variable"
qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit
@ -415,19 +415,19 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation
animations 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)" # 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> # tag = <EMPTY>
# tagFile = "$$PWD/../../.tag" # 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" # QMAKE_INTERNAL_INCLUDED_FILES = "$$tagFile"
# tag = "$$cat($$tagFile, singleline)" # 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" # 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" # QML_COMPILE_HASH = "$$commit"
# commit = "$$system(git rev-parse HEAD)" # 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 -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" # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
qt_extend_target(Qml CONDITION WINRT 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 ../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" # ITAB = "$$PWD/disassembler/udis86/optable.xml"
# QMAKE_EXTRA_COMPILERS = "udis86" # QMAKE_EXTRA_COMPILERS = "udis86"
# QMAKE_EXTRA_TARGETS = "udis86_tab_cfile" # QMAKE_EXTRA_TARGETS = "udis86_tab_cfile"
# udis86.CONFIG = "no_link" # 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.input = "ITAB"
# udis86.output = "udis86_itab.h" # udis86.output = "udis86_itab.h"
# udis86_tab_cfile.depends = "udis86_itab.h" # udis86_tab_cfile.depends = "udis86_itab.h"
# udis86_tab_cfile.target = "$$OUT_PWD/udis86_itab.c" # 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" # 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" # GENERATEDDIR = "$$GENERATEDDIR/release"
qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG) 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_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
QT_QML_MODULE_URI QtQml QT_QML_MODULE_URI QtQml
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml" QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml"
) )

26
src/qml/CMakeLists.txt
View File

@ -370,7 +370,7 @@ qt_extend_target(Qml CONDITION WIN32 AND NOT WINRT
shell32 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" # QMAKE_CXXFLAGS_RELEASE = "--O2"
qt_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips") 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- -d2SSAOptimizer-
) )
#### Keys ignored in scope 10:.:.:qml.pro:ICC: #### Keys ignored in scope 11:.:.:qml.pro:ICC:
# WERROR = "-ww2415" # 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" # WERROR = "-Wno-error=unused-const-variable"
qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit
@ -422,19 +422,19 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation
animations 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)" # 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> # tag = <EMPTY>
# tagFile = "$$PWD/../../.tag" # 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" # QMAKE_INTERNAL_INCLUDED_FILES = "$$tagFile"
# tag = "$$cat($$tagFile, singleline)" # 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" # 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" # QML_COMPILE_HASH = "$$commit"
# commit = "$$system(git rev-parse HEAD)" # 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 -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" # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
qt_extend_target(Qml CONDITION WINRT 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 ../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" # ITAB = "$$PWD/disassembler/udis86/optable.xml"
# QMAKE_EXTRA_COMPILERS = "udis86" # QMAKE_EXTRA_COMPILERS = "udis86"
# QMAKE_EXTRA_TARGETS = "udis86_tab_cfile" # QMAKE_EXTRA_TARGETS = "udis86_tab_cfile"
# udis86.CONFIG = "no_link" # 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.input = "ITAB"
# udis86.output = "udis86_itab.h" # udis86.output = "udis86_itab.h"
# udis86_tab_cfile.depends = "udis86_itab.h" # udis86_tab_cfile.depends = "udis86_itab.h"
# udis86_tab_cfile.target = "$$OUT_PWD/udis86_itab.c" # 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" # 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" # GENERATEDDIR = "$$GENERATEDDIR/release"
qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG) 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_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
QT_QML_MODULE_URI QtQml QT_QML_MODULE_URI QtQml
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml" QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml"
QT_QMLTYPES_FILENAME "plugins.qmltypes"
) )
qt6_qml_type_registration(Qml) qt6_qml_type_registration(Qml)

2
src/qmlmodels/CMakeLists.txt
View File

@ -72,8 +72,8 @@ set_target_properties(QmlModels PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
QT_QML_MODULE_URI QtQml.Models QT_QML_MODULE_URI QtQml.Models
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/Models" QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/Models"
QT_QMLTYPES_FILENAME "plugins.qmltypes"
) )
qt6_qml_type_registration(QmlModels) qt6_qml_type_registration(QmlModels)

1
src/qmltest/.prev_CMakeLists.txt
View File

@ -67,6 +67,7 @@ set_target_properties(QuickTest PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_VERSION 1.0
QT_QML_MODULE_URI Qt.test.qtestroot QT_QML_MODULE_URI Qt.test.qtestroot
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/test/qtestroot" QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/test/qtestroot"
) )

2
src/qmltest/CMakeLists.txt
View File

@ -68,8 +68,8 @@ set_target_properties(QuickTest PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_VERSION 1.0
QT_QML_MODULE_URI Qt.test.qtestroot QT_QML_MODULE_URI Qt.test.qtestroot
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/test/qtestroot" QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/test/qtestroot"
QT_QMLTYPES_FILENAME "plugins.qmltypes"
) )
qt6_qml_type_registration(QuickTest) qt6_qml_type_registration(QuickTest)

1
src/qmltyperegistrar/.prev_CMakeLists.txt
View File

@ -5,6 +5,7 @@
##################################################################### #####################################################################
qt_add_tool(qmltyperegistrar qt_add_tool(qmltyperegistrar
TARGET_DESCRIPTION "QML Types Registrar"
SOURCES SOURCES
../../tools/shared/qmlstreamwriter.cpp ../../tools/shared/qmlstreamwriter.h ../../tools/shared/qmlstreamwriter.cpp ../../tools/shared/qmlstreamwriter.h
qmltyperegistrar.cpp qmltyperegistrar.cpp

1
src/qmltyperegistrar/CMakeLists.txt
View File

@ -5,6 +5,7 @@
##################################################################### #####################################################################
qt_add_tool(qmltyperegistrar qt_add_tool(qmltyperegistrar
TARGET_DESCRIPTION "QML Types Registrar"
TOOLS_TARGET Qml # special case TOOLS_TARGET Qml # special case
SOURCES SOURCES
../../tools/shared/qmlstreamwriter.cpp ../../tools/shared/qmlstreamwriter.h ../../tools/shared/qmlstreamwriter.cpp ../../tools/shared/qmlstreamwriter.h

1
src/qmlworkerscript/.prev_CMakeLists.txt
View File

@ -108,6 +108,7 @@ set_target_properties(QmlWorkerScript PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
QT_QML_MODULE_URI QtQml.WorkerScript QT_QML_MODULE_URI QtQml.WorkerScript
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript"
) )

2
src/qmlworkerscript/CMakeLists.txt
View File

@ -108,8 +108,8 @@ set_target_properties(QmlWorkerScript PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
QT_QML_MODULE_URI QtQml.WorkerScript QT_QML_MODULE_URI QtQml.WorkerScript
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript"
QT_QMLTYPES_FILENAME "plugins.qmltypes"
) )
qt6_qml_type_registration(QmlWorkerScript) qt6_qml_type_registration(QmlWorkerScript)

2
src/quick/CMakeLists.txt
View File

@ -615,8 +615,8 @@ set_target_properties(Quick PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
QT_QML_MODULE_URI QtQuick QT_QML_MODULE_URI QtQuick
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick" QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick"
QT_QMLTYPES_FILENAME "plugins.qmltypes"
) )
qt6_qml_type_registration(Quick) qt6_qml_type_registration(Quick)

1
src/quickshapes/CMakeLists.txt
View File

@ -74,6 +74,7 @@ set_target_properties(QuickShapes PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
QT_QML_MODULE_URI QtQuick.Shapes QT_QML_MODULE_URI QtQuick.Shapes
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Shapes" QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Shapes"
) )