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

Post-merge fixes 

Change-Id: I2350df5368ee34d6c7072d456806e518ce533839
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-01-28 23:41:18 +01:00
parent b684ba2194
commit b134476cdb
17 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -7,8 +7,8 @@ project(QtDeclarative
LANGUAGES CXX C LANGUAGES CXX C
) )
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui Widgets Network find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui Widgets Network OpenGL # special case
OPTIONAL_COMPONENTS Sql Concurrent Test) OPTIONAL_COMPONENTS Sql Concurrent Test) # special case
# export QT6_ADD_QML_MODULE to this project # export QT6_ADD_QML_MODULE to this project
include(src/qml/Qt6QmlMacros.cmake) include(src/qml/Qt6QmlMacros.cmake)

4
examples/quick/shapes/CMakeLists.txt
View File

@ -73,6 +73,9 @@ set_source_files_properties("content/item15.qml"
set_source_files_properties("content/item17.qml" set_source_files_properties("content/item17.qml"
PROPERTIES QT_RESOURCE_ALIAS "item17.qml" PROPERTIES QT_RESOURCE_ALIAS "item17.qml"
) )
set_source_files_properties("content/item18.qml"
PROPERTIES QT_RESOURCE_ALIAS "item18.qml"
)
set_source_files_properties("content/item2.qml" set_source_files_properties("content/item2.qml"
PROPERTIES QT_RESOURCE_ALIAS "item2.qml" PROPERTIES QT_RESOURCE_ALIAS "item2.qml"
) )
@ -128,6 +131,7 @@ set(shapes_resource_files
"content/item14.qml" "content/item14.qml"
"content/item15.qml" "content/item15.qml"
"content/item17.qml" "content/item17.qml"
"content/item18.qml"
"content/item2.qml" "content/item2.qml"
"content/item3.qml" "content/item3.qml"
"content/item4.qml" "content/item4.qml"

3
src/imports/models/CMakeLists.txt
View File

@ -5,7 +5,6 @@
##################################################################### #####################################################################
qt_add_qml_module(modelsplugin qt_add_qml_module(modelsplugin
TARGET_PATH "QtQml/Models.2"
URI "QtQml.Models" URI "QtQml.Models"
VERSION "2.15" VERSION "2.15"
DESIGNER_SUPPORTED DESIGNER_SUPPORTED
@ -24,4 +23,4 @@ qt_add_qml_module(modelsplugin
#### Keys ignored in scope 1:.:.:models.pro:<TRUE>: #### Keys ignored in scope 1:.:.:models.pro:<TRUE>:
# CXX_MODULE = "qml" # CXX_MODULE = "qml"
# IMPORT_VERSION = "2.15" # IMPORT_VERSION = "2.15"
# TARGETPATH = "QtQml/Models.2" # TARGETPATH = "QtQml/Models"

3
src/imports/particles/CMakeLists.txt
View File

@ -5,7 +5,6 @@
##################################################################### #####################################################################
qt_add_qml_module(particlesplugin qt_add_qml_module(particlesplugin
TARGET_PATH "QtQuick/Particles.2"
URI "QtQuick.Particles" URI "QtQuick.Particles"
VERSION "2.15" VERSION "2.15"
CLASSNAME QtQuick2ParticlesPlugin CLASSNAME QtQuick2ParticlesPlugin
@ -27,4 +26,4 @@ qt_add_qml_module(particlesplugin
#### Keys ignored in scope 1:.:.:particles.pro:<TRUE>: #### Keys ignored in scope 1:.:.:particles.pro:<TRUE>:
# CXX_MODULE = "qml" # CXX_MODULE = "qml"
# IMPORT_VERSION = "2.15" # IMPORT_VERSION = "2.15"
# TARGETPATH = "QtQuick/Particles.2" # TARGETPATH = "QtQuick/Particles"

3
src/imports/qtquick2/CMakeLists.txt
View File

@ -5,7 +5,6 @@
##################################################################### #####################################################################
qt_add_qml_module(qtquick2plugin qt_add_qml_module(qtquick2plugin
TARGET_PATH "QtQuick.2"
URI "QtQuick" URI "QtQuick"
VERSION "2.15" VERSION "2.15"
DESIGNER_SUPPORTED DESIGNER_SUPPORTED
@ -30,7 +29,7 @@ qt_add_qml_module(qtquick2plugin
#### Keys ignored in scope 1:.:.:qtquick2.pro:<TRUE>: #### Keys ignored in scope 1:.:.:qtquick2.pro:<TRUE>:
# CXX_MODULE = "qml" # CXX_MODULE = "qml"
# IMPORT_VERSION = "2.15" # IMPORT_VERSION = "2.15"
# TARGETPATH = "QtQuick.2" # TARGETPATH = "QtQuick"
## Scopes: ## Scopes:
##################################################################### #####################################################################

3
src/imports/window/CMakeLists.txt
View File

@ -5,7 +5,6 @@
##################################################################### #####################################################################
qt_add_qml_module(windowplugin qt_add_qml_module(windowplugin
TARGET_PATH "QtQuick/Window.2"
URI "QtQuick.Window" URI "QtQuick.Window"
VERSION "2.15" VERSION "2.15"
DESIGNER_SUPPORTED DESIGNER_SUPPORTED
@ -27,4 +26,4 @@ qt_add_qml_module(windowplugin
#### Keys ignored in scope 1:.:.:window.pro:<TRUE>: #### Keys ignored in scope 1:.:.:window.pro:<TRUE>:
# CXX_MODULE = "qml" # CXX_MODULE = "qml"
# IMPORT_VERSION = "2.15" # IMPORT_VERSION = "2.15"
# TARGETPATH = "QtQuick/Window.2" # TARGETPATH = "QtQuick/Window"

3
src/imports/workerscript/CMakeLists.txt
View File

@ -5,7 +5,6 @@
##################################################################### #####################################################################
qt_add_qml_module(workerscriptplugin qt_add_qml_module(workerscriptplugin
TARGET_PATH "QtQml/WorkerScript.2"
URI "QtQml.WorkerScript" URI "QtQml.WorkerScript"
VERSION "2.15" VERSION "2.15"
DESIGNER_SUPPORTED DESIGNER_SUPPORTED
@ -24,4 +23,4 @@ qt_add_qml_module(workerscriptplugin
#### Keys ignored in scope 1:.:.:workerscript.pro:<TRUE>: #### Keys ignored in scope 1:.:.:workerscript.pro:<TRUE>:
# CXX_MODULE = "qml" # CXX_MODULE = "qml"
# IMPORT_VERSION = "2.15" # IMPORT_VERSION = "2.15"
# TARGETPATH = "QtQml/WorkerScript.2" # TARGETPATH = "QtQml/WorkerScript"

4
src/particles/CMakeLists.txt
View File

@ -102,7 +102,7 @@ qt_add_resource(QuickParticles "particles1"
# IMPORT_VERSION = "2.15" # IMPORT_VERSION = "2.15"
# MODULE = "quickparticles" # MODULE = "quickparticles"
# QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_FILENAME = "plugins.qmltypes"
# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick/Particles.2" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick/Particles"
# QML_IMPORT_NAME = "QtQuick.Particles" # QML_IMPORT_NAME = "QtQuick.Particles"
## Scopes: ## Scopes:
@ -134,7 +134,7 @@ set_target_properties(QuickParticles PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_VERSION 2.15
QT_QML_MODULE_URI QtQuick.Particles QT_QML_MODULE_URI QtQuick.Particles
QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick/Particles.2" QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick/Particles"
) )
qt6_qml_type_registration(QuickParticles) qt6_qml_type_registration(QuickParticles)

1
src/qml/.prev_CMakeLists.txt
View File

@ -76,6 +76,7 @@ qt_add_module(Qml
debugger/qqmldebugserviceinterfaces_p.h debugger/qqmldebugserviceinterfaces_p.h
debugger/qqmldebugstatesdelegate_p.h debugger/qqmldebugstatesdelegate_p.h
debugger/qqmlprofiler_p.h debugger/qqmlprofiler_p.h
inlinecomponentutils_p.h
jsapi/qjsengine.cpp jsapi/qjsengine.h jsapi/qjsengine_p.h jsapi/qjsengine.cpp jsapi/qjsengine.h jsapi/qjsengine_p.h
jsapi/qjsvalue.cpp jsapi/qjsvalue.h jsapi/qjsvalue_p.h jsapi/qjsvalue.cpp jsapi/qjsvalue.h jsapi/qjsvalue_p.h
jsapi/qjsvalueiterator.cpp jsapi/qjsvalueiterator.h jsapi/qjsvalueiterator_p.h jsapi/qjsvalueiterator.cpp jsapi/qjsvalueiterator.h jsapi/qjsvalueiterator_p.h

1
src/qml/CMakeLists.txt
View File

@ -76,6 +76,7 @@ qt_add_module(Qml
debugger/qqmldebugserviceinterfaces_p.h debugger/qqmldebugserviceinterfaces_p.h
debugger/qqmldebugstatesdelegate_p.h debugger/qqmldebugstatesdelegate_p.h
debugger/qqmlprofiler_p.h debugger/qqmlprofiler_p.h
inlinecomponentutils_p.h
jsapi/qjsengine.cpp jsapi/qjsengine.h jsapi/qjsengine_p.h jsapi/qjsengine.cpp jsapi/qjsengine.h jsapi/qjsengine_p.h
jsapi/qjsvalue.cpp jsapi/qjsvalue.h jsapi/qjsvalue_p.h jsapi/qjsvalue.cpp jsapi/qjsvalue.h jsapi/qjsvalue_p.h
jsapi/qjsvalueiterator.cpp jsapi/qjsvalueiterator.h jsapi/qjsvalueiterator_p.h jsapi/qjsvalueiterator.cpp jsapi/qjsvalueiterator.h jsapi/qjsvalueiterator_p.h

4
src/qmlmodels/CMakeLists.txt
View File

@ -25,7 +25,7 @@ qt_add_module(QmlModels
#### Keys ignored in scope 1:.:.:qmlmodels.pro:<TRUE>: #### Keys ignored in scope 1:.:.:qmlmodels.pro:<TRUE>:
# IMPORT_VERSION = "2.15" # IMPORT_VERSION = "2.15"
# QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_FILENAME = "plugins.qmltypes"
# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/Models.2" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/Models"
# QML_IMPORT_NAME = "QtQml.Models" # QML_IMPORT_NAME = "QtQml.Models"
## Scopes: ## Scopes:
@ -69,7 +69,7 @@ set_target_properties(QmlModels PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_VERSION 2.15
QT_QML_MODULE_URI QtQml.Models QT_QML_MODULE_URI QtQml.Models
QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/Models.2" QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/Models"
) )
qt6_qml_type_registration(QmlModels) qt6_qml_type_registration(QmlModels)

4
src/qmlworkerscript/.prev_CMakeLists.txt
View File

@ -48,7 +48,7 @@ qt_add_module(QmlWorkerScript
#### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: #### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>:
# IMPORT_VERSION = "2.15" # IMPORT_VERSION = "2.15"
# QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_FILENAME = "plugins.qmltypes"
# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript.2" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript"
# QML_IMPORT_NAME = "QtQml.WorkerScript" # QML_IMPORT_NAME = "QtQml.WorkerScript"
## Scopes: ## Scopes:
@ -105,7 +105,7 @@ set_target_properties(QmlWorkerScript PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_VERSION 2.15
QT_QML_MODULE_URI QtQml.WorkerScript QT_QML_MODULE_URI QtQml.WorkerScript
QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript.2" QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript"
) )
qt6_qml_type_registration(QmlWorkerScript) qt6_qml_type_registration(QmlWorkerScript)

4
src/qmlworkerscript/CMakeLists.txt
View File

@ -48,7 +48,7 @@ qt_add_module(QmlWorkerScript
#### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: #### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>:
# IMPORT_VERSION = "2.15" # IMPORT_VERSION = "2.15"
# QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_FILENAME = "plugins.qmltypes"
# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript.2" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript"
# QML_IMPORT_NAME = "QtQml.WorkerScript" # QML_IMPORT_NAME = "QtQml.WorkerScript"
## Scopes: ## Scopes:
@ -105,7 +105,7 @@ set_target_properties(QmlWorkerScript PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_VERSION 2.15
QT_QML_MODULE_URI QtQml.WorkerScript QT_QML_MODULE_URI QtQml.WorkerScript
QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript.2" QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript"
) )
qt6_qml_type_registration(QmlWorkerScript) qt6_qml_type_registration(QmlWorkerScript)

13
src/quick/CMakeLists.txt
View File

@ -350,7 +350,7 @@ endif()
#### Keys ignored in scope 1:.:.:quick.pro:<TRUE>: #### Keys ignored in scope 1:.:.:quick.pro:<TRUE>:
# IMPORT_VERSION = "2.15" # IMPORT_VERSION = "2.15"
# QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_FILENAME = "plugins.qmltypes"
# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick.2" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick"
# QML_IMPORT_NAME = "QtQuick" # QML_IMPORT_NAME = "QtQuick"
## Scopes: ## Scopes:
@ -361,12 +361,17 @@ qt_extend_target(Quick CONDITION QT_FEATURE_qml_network
Qt::Network Qt::Network
) )
qt_extend_target(Quick CONDITION QT_FEATURE_opengl
LIBRARIES
Qt::OpenGLPrivate
)
qt_extend_target(Quick CONDITION MSVC qt_extend_target(Quick CONDITION MSVC
DEFINES DEFINES
_CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_WARNINGS
) )
#### Keys ignored in scope 4:.:.:quick.pro:solaris-cc_x_: #### Keys ignored in scope 5:.:.:quick.pro:solaris-cc_x_:
# QMAKE_CXXFLAGS_RELEASE = "--O2" # QMAKE_CXXFLAGS_RELEASE = "--O2"
qt_extend_target(Quick CONDITION WIN32 AND NOT WINRT qt_extend_target(Quick CONDITION WIN32 AND NOT WINRT
@ -568,7 +573,7 @@ qt_extend_target(Quick CONDITION QT_FEATURE_opengl AND QT_FEATURE_quick_shaderef
items/qquickopenglshadereffectnode.cpp items/qquickopenglshadereffectnode_p.h items/qquickopenglshadereffectnode.cpp items/qquickopenglshadereffectnode_p.h
) )
#### Keys ignored in scope 40:.:items:items/items.pri:QT_FEATURE_opengl: #### Keys ignored in scope 41:.:items:items/items.pri:QT_FEATURE_opengl:
# OTHER_FILES = "$$PWD/shaders/shadereffect.vert" "$$PWD/shaders/shadereffect.frag" "$$PWD/shaders/shadereffectfallback.vert" "$$PWD/shaders/shadereffectfallback.frag" "$$PWD/shaders/shadereffect_core.vert" "$$PWD/shaders/shadereffect_core.frag" "$$PWD/shaders/shadereffectfallback_core.vert" "$$PWD/shaders/shadereffectfallback_core.frag" # OTHER_FILES = "$$PWD/shaders/shadereffect.vert" "$$PWD/shaders/shadereffect.frag" "$$PWD/shaders/shadereffectfallback.vert" "$$PWD/shaders/shadereffectfallback.frag" "$$PWD/shaders/shadereffect_core.vert" "$$PWD/shaders/shadereffect_core.frag" "$$PWD/shaders/shadereffectfallback_core.vert" "$$PWD/shaders/shadereffectfallback_core.frag"
qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas
@ -598,7 +603,7 @@ set_target_properties(Quick PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_VERSION 2.15
QT_QML_MODULE_URI QtQuick QT_QML_MODULE_URI QtQuick
QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick.2" QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick"
) )
qt6_qml_type_registration(Quick) qt6_qml_type_registration(Quick)

6
tests/auto/quick/CMakeLists.txt
View File

@ -22,7 +22,7 @@ if(QT_FEATURE_private_tests)
add_subdirectory(qquickstates) add_subdirectory(qquickstates)
add_subdirectory(qquicksystempalette) add_subdirectory(qquicksystempalette)
add_subdirectory(qquicktimeline) add_subdirectory(qquicktimeline)
add_subdirectory(pointerhandlers) # add_subdirectory(pointerhandlers) # skip building until fixed in dev # special case
add_subdirectory(qquickaccessible) add_subdirectory(qquickaccessible)
add_subdirectory(qquickanchors) add_subdirectory(qquickanchors)
add_subdirectory(qquickanimatedimage) add_subdirectory(qquickanimatedimage)
@ -44,7 +44,7 @@ if(QT_FEATURE_private_tests)
add_subdirectory(qquicktableview) add_subdirectory(qquicktableview)
add_subdirectory(qquickloader) add_subdirectory(qquickloader)
add_subdirectory(qquickmousearea) add_subdirectory(qquickmousearea)
add_subdirectory(qquickmultipointtoucharea) # add_subdirectory(qquickmultipointtoucharea) # skip building until fixed in dev # special case
add_subdirectory(qquickpainteditem) add_subdirectory(qquickpainteditem)
add_subdirectory(qquickshape) add_subdirectory(qquickshape)
add_subdirectory(qquickpathview) add_subdirectory(qquickpathview)
@ -62,7 +62,7 @@ if(QT_FEATURE_private_tests)
add_subdirectory(qquickcanvasitem) add_subdirectory(qquickcanvasitem)
add_subdirectory(qquickdesignersupport) add_subdirectory(qquickdesignersupport)
add_subdirectory(qquickscreen) add_subdirectory(qquickscreen)
add_subdirectory(touchmouse) # add_subdirectory(touchmouse) # skip building until fixed in dev # special case
add_subdirectory(scenegraph) add_subdirectory(scenegraph)
add_subdirectory(sharedimage) add_subdirectory(sharedimage)
endif() endif()

5
tests/auto/quick/nokeywords/CMakeLists.txt
View File

@ -20,3 +20,8 @@ qt_add_test(tst_nokeywords
## Scopes: ## Scopes:
##################################################################### #####################################################################
qt_extend_target(tst_nokeywords CONDITION QT_FEATURE_opengl
LIBRARIES
Qt::OpenGLPrivate
)

3
tests/benchmarks/qml/painting/CMakeLists.txt
View File

@ -10,10 +10,11 @@ qt_add_benchmark(painting
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::OpenGL Qt::OpenGL
Qt::Widgets
) )
#### Keys ignored in scope 1:.:.:painting.pro:<TRUE>: #### Keys ignored in scope 1:.:.:painting.pro:<TRUE>:
# _REQUIREMENTS = "qtHaveModule(opengl)" # _REQUIREMENTS = "qtHaveModule(opengl)" "qtHaveModule(widgets)"
## Scopes: ## Scopes:
##################################################################### #####################################################################