diff options
Diffstat (limited to 'src')
36 files changed, 69 insertions, 75 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fae670d4ff..d3c26e73e6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -40,7 +40,7 @@ if(QT_FEATURE_qml_devtools) add_subdirectory(qmldevtools) # Build qmlcachegen now, so that we can use it in src/imports. - if(QT_FEATURE_commandlineparser AND QT_FEATURE_qml_devtools AND QT_FEATURE_xmlstreamwriter) + if(QT_FEATURE_qml_devtools AND QT_FEATURE_xmlstreamwriter) add_subdirectory(../tools/qmlcachegen qmlcachegen) endif() endif() diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt index 64dce0170b..020f683e41 100644 --- a/src/imports/CMakeLists.txt +++ b/src/imports/CMakeLists.txt @@ -24,6 +24,8 @@ if(TARGET Qt::Quick) add_subdirectory(layouts) add_subdirectory(qtquick2) add_subdirectory(window) +endif() +if(QT_FEATURE_quick_shadereffect AND TARGET Qt::Quick) add_subdirectory(wavefrontmesh) endif() if(TARGET Qt::Quick AND TARGET Qt::Test) diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt index cc2249c5d0..0bc9f28da6 100644 --- a/src/imports/folderlistmodel/CMakeLists.txt +++ b/src/imports/folderlistmodel/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qmlfolderlistmodelplugin URI "Qt.labs.folderlistmodel" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QmlFolderListModelPlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -22,5 +22,5 @@ qt_add_qml_module(qmlfolderlistmodelplugin #### Keys ignored in scope 1:.:.:folderlistmodel.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "Qt/labs/folderlistmodel" diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt index a8830231da..a4de38267e 100644 --- a/src/imports/labsanimation/CMakeLists.txt +++ b/src/imports/labsanimation/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(labsanimationplugin URI "Qt.labs.animation" - VERSION "1.0" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtLabsAnimationPlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -20,5 +20,5 @@ qt_add_qml_module(labsanimationplugin #### Keys ignored in scope 1:.:.:labsanimation.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.0" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "Qt/labs/animation" diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt index 358bd5df18..efd3339e2f 100644 --- a/src/imports/labsmodels/CMakeLists.txt +++ b/src/imports/labsmodels/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(labsmodelsplugin URI "Qt.labs.qmlmodels" - VERSION "1.0" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQmlLabsModelsPlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -19,7 +19,7 @@ qt_add_qml_module(labsmodelsplugin #### Keys ignored in scope 1:.:.:labsmodels.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.0" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "Qt/labs/qmlmodels" ## Scopes: diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt index f788bd3f5a..ffde82d340 100644 --- a/src/imports/layouts/CMakeLists.txt +++ b/src/imports/layouts/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qquicklayoutsplugin URI "QtQuick.Layouts" - VERSION "1.15" + VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQuickLayoutsPlugin SKIP_TYPE_REGISTRATION @@ -29,5 +29,5 @@ qt_add_qml_module(qquicklayoutsplugin #### Keys ignored in scope 1:.:.:layouts.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQuick/Layouts" diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt index 4727de7f93..d3fd8ff290 100644 --- a/src/imports/localstorage/CMakeLists.txt +++ b/src/imports/localstorage/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qmllocalstorageplugin URI "QtQuick.LocalStorage" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QQmlLocalStoragePlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -21,6 +21,6 @@ qt_add_qml_module(qmllocalstorageplugin #### Keys ignored in scope 1:.:.:localstorage.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.15" # OTHER_FILES = "localstorage.json" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQuick/LocalStorage" diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt index 0efe8eb479..a6d4065202 100644 --- a/src/imports/models/CMakeLists.txt +++ b/src/imports/models/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(modelsplugin URI "QtQml.Models" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlModelsPlugin SKIP_TYPE_REGISTRATION @@ -19,5 +19,5 @@ qt_add_qml_module(modelsplugin #### Keys ignored in scope 1:.:.:models.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQml/Models" diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt index 8326575cdc..6d5e71f7d1 100644 --- a/src/imports/particles/CMakeLists.txt +++ b/src/imports/particles/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(particlesplugin URI "QtQuick.Particles" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuick2ParticlesPlugin SKIP_TYPE_REGISTRATION SOURCES @@ -21,5 +21,5 @@ qt_add_qml_module(particlesplugin #### Keys ignored in scope 1:.:.:particles.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQuick/Particles" diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt index 7db224aa44..4e17431218 100644 --- a/src/imports/qtqml/.prev_CMakeLists.txt +++ b/src/imports/qtqml/.prev_CMakeLists.txt @@ -16,7 +16,7 @@ endif() qt_add_qml_module(qmlplugin URI "QtQml" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlPlugin SKIP_TYPE_REGISTRATION @@ -31,7 +31,7 @@ qt_add_qml_module(qmlplugin #### Keys ignored in scope 1:.:.:qtqml.pro:<TRUE>: # CXX_MODULE = "qml" # DYNAMIC_QMLDIR = "module QtQml" "plugin qmlplugin" "classname QtQmlPlugin" "typeinfo plugins.qmltypes" "designersupported" "import QtQml.Models" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQml" ## Scopes: diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt index 705d4c965b..f50f2f69f5 100644 --- a/src/imports/qtqml/CMakeLists.txt +++ b/src/imports/qtqml/CMakeLists.txt @@ -16,7 +16,7 @@ endif() qt_add_qml_module(qmlplugin URI "QtQml" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlPlugin SKIP_TYPE_REGISTRATION @@ -32,7 +32,7 @@ qt_add_qml_module(qmlplugin #### Keys ignored in scope 1:.:.:qtqml.pro:<TRUE>: # CXX_MODULE = "qml" # DYNAMIC_QMLDIR = "module QtQml" "plugin qmlplugin" "classname QtQmlPlugin" "typeinfo plugins.qmltypes" "designersupported" "import QtQml.Models" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQml" ## Scopes: diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt index 6b017885ae..e007c476f8 100644 --- a/src/imports/qtquick2/CMakeLists.txt +++ b/src/imports/qtquick2/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qtquick2plugin URI "QtQuick" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQuick2Plugin SKIP_TYPE_REGISTRATION @@ -24,7 +24,7 @@ qt_add_qml_module(qtquick2plugin #### Keys ignored in scope 1:.:.:qtquick2.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQuick" ## Scopes: diff --git a/src/imports/settings/CMakeLists.txt b/src/imports/settings/CMakeLists.txt index c9b570fbf8..0243e2cf8f 100644 --- a/src/imports/settings/CMakeLists.txt +++ b/src/imports/settings/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qmlsettingsplugin URI "Qt.labs.settings" - VERSION "1.1" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QmlSettingsPlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -20,5 +20,5 @@ qt_add_qml_module(qmlsettingsplugin #### Keys ignored in scope 1:.:.:settings.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.1" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "Qt/labs/settings" diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt index c745ccd038..92ad133fd8 100644 --- a/src/imports/shapes/CMakeLists.txt +++ b/src/imports/shapes/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qmlshapesplugin URI "QtQuick.Shapes" - VERSION "1.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QmlShapesPlugin SKIP_TYPE_REGISTRATION SOURCES @@ -21,5 +21,5 @@ qt_add_qml_module(qmlshapesplugin #### Keys ignored in scope 1:.:.:shapes.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQuick/Shapes" diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt index b6d61cf1e5..c840fda85f 100644 --- a/src/imports/sharedimage/CMakeLists.txt +++ b/src/imports/sharedimage/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(sharedimageplugin URI "Qt.labs.sharedimage" - VERSION "1.0" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickSharedImagePlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -25,5 +25,5 @@ qt_add_qml_module(sharedimageplugin #### Keys ignored in scope 1:.:.:sharedimage.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.0" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "Qt/labs/sharedimage" diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt index 4e4b73cc7d..232f3f28d5 100644 --- a/src/imports/statemachine/CMakeLists.txt +++ b/src/imports/statemachine/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qtqmlstatemachine URI "QtQml.StateMachine" - VERSION "1.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQmlStateMachinePlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -26,5 +26,5 @@ qt_add_qml_module(qtqmlstatemachine #### Keys ignored in scope 1:.:.:statemachine.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQml/StateMachine" diff --git a/src/imports/testlib/.prev_CMakeLists.txt b/src/imports/testlib/.prev_CMakeLists.txt index 43c30c7f39..b7a6ff468a 100644 --- a/src/imports/testlib/.prev_CMakeLists.txt +++ b/src/imports/testlib/.prev_CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qmltestplugin URI "QtTest" - VERSION "1.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QTestQmlModule DEPENDENCIES QtQuick.Window/2.0 @@ -29,9 +29,9 @@ qt_add_qml_module(qmltestplugin #### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.15" # OTHER_FILES = "testlib.json" # QML_FILES = "TestCase.qml" "SignalSpy.qml" "testlogger.js" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtTest" set(qml_files diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt index 18f1751d61..03801d76eb 100644 --- a/src/imports/testlib/CMakeLists.txt +++ b/src/imports/testlib/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qmltestplugin URI "QtTest" - VERSION "1.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QTestQmlModule DEPENDENCIES QtQuick.Window/2.0 @@ -29,9 +29,9 @@ qt_add_qml_module(qmltestplugin #### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.15" # OTHER_FILES = "testlib.json" # QML_FILES = "TestCase.qml" "SignalSpy.qml" "testlogger.js" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtTest" set(qml_files diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt index be083aede5..3790b7d53e 100644 --- a/src/imports/wavefrontmesh/CMakeLists.txt +++ b/src/imports/wavefrontmesh/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qmlwavefrontmeshplugin URI "Qt.labs.wavefrontmesh" - VERSION "1.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QmlWavefrontMeshPlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -21,5 +21,5 @@ qt_add_qml_module(qmlwavefrontmeshplugin #### Keys ignored in scope 1:.:.:wavefrontmesh.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "Qt/labs/wavefrontmesh" diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt index c300126bac..99cedf333c 100644 --- a/src/imports/window/CMakeLists.txt +++ b/src/imports/window/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(windowplugin URI "QtQuick.Window" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQuick2WindowPlugin SKIP_TYPE_REGISTRATION @@ -22,5 +22,5 @@ qt_add_qml_module(windowplugin #### Keys ignored in scope 1:.:.:window.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQuick/Window" diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt index ac2b0fda7e..57b2739a10 100644 --- a/src/imports/workerscript/CMakeLists.txt +++ b/src/imports/workerscript/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(workerscriptplugin URI "QtQml.WorkerScript" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlWorkerScriptPlugin SKIP_TYPE_REGISTRATION @@ -19,5 +19,5 @@ qt_add_qml_module(workerscriptplugin #### Keys ignored in scope 1:.:.:workerscript.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQml/WorkerScript" diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt index 36f492b4a5..f2da8b3e1c 100644 --- a/src/particles/CMakeLists.txt +++ b/src/particles/CMakeLists.txt @@ -94,11 +94,11 @@ qt_add_resource(QuickParticles "particles1" #### Keys ignored in scope 1:.:.:particles.pro:<TRUE>: -# IMPORT_VERSION = "2.15" # MODULE = "quickparticles" # QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick/Particles" # QML_IMPORT_NAME = "QtQuick.Particles" +# QML_IMPORT_VERSION = "$$QT_VERSION" ## Scopes: ##################################################################### @@ -127,7 +127,7 @@ qt_extend_target(QuickParticles CONDITION QT_FEATURE_quick_shadereffect set_target_properties(QuickParticles PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQuick.Particles QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Particles" ) diff --git a/src/plugins/qmltooling/CMakeLists.txt b/src/plugins/qmltooling/CMakeLists.txt index c692f4c9be..01cd40ffbb 100644 --- a/src/plugins/qmltooling/CMakeLists.txt +++ b/src/plugins/qmltooling/CMakeLists.txt @@ -19,6 +19,6 @@ if(TARGET Qt::Quick) add_subdirectory(qmldbg_inspector) add_subdirectory(qmldbg_quickprofiler) endif() -if(QT_FEATURE_qml_network AND TARGET Qt::Quick) +if(QT_FEATURE_qml_network AND QT_FEATURE_settings AND TARGET Qt::Quick) add_subdirectory(qmldbg_preview) endif() diff --git a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt index 3ef787cad3..908fd961fe 100644 --- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt @@ -8,6 +8,7 @@ qt_add_plugin(QQmlPreviewServiceFactory OUTPUT_NAME qmldbg_preview TYPE qmltooling SOURCES + qqmldebugtranslationservice.cpp qqmldebugtranslationservice.h qqmlpreviewblacklist.cpp qqmlpreviewblacklist.h qqmlpreviewfileengine.cpp qqmlpreviewfileengine.h qqmlpreviewfileloader.cpp qqmlpreviewfileloader.h diff --git a/src/plugins/scenegraph/.prev_CMakeLists.txt b/src/plugins/scenegraph/.prev_CMakeLists.txt index b41ceed2b8..0e65d182ee 100644 --- a/src/plugins/scenegraph/.prev_CMakeLists.txt +++ b/src/plugins/scenegraph/.prev_CMakeLists.txt @@ -1,8 +1,5 @@ # Generated from scenegraph.pro. -if(QT_FEATURE_d3d12) - add_subdirectory(d3d12) -endif() if(QT_FEATURE_openvg) add_subdirectory(openvg) endif() diff --git a/src/plugins/scenegraph/CMakeLists.txt b/src/plugins/scenegraph/CMakeLists.txt index 364c38bc8b..0e65d182ee 100644 --- a/src/plugins/scenegraph/CMakeLists.txt +++ b/src/plugins/scenegraph/CMakeLists.txt @@ -1,11 +1,5 @@ # Generated from scenegraph.pro. -# special case begin -#if(QT_FEATURE_d3d12) -# add_subdirectory(d3d12) -#endif() -# special case end - if(QT_FEATURE_openvg) add_subdirectory(openvg) endif() diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index 504d26e03d..9528b3068a 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -55,6 +55,7 @@ qt_add_module(Qml common/qqmljsdiagnosticmessage_p.h common/qqmljsfixedpoolarray_p.h common/qqmljsmemorypool_p.h + common/qqmljssourcelocation_p.h common/qv4alloca_p.h common/qv4calldata_p.h common/qv4compileddata_p.h @@ -163,7 +164,6 @@ qt_add_module(Qml parser/qqmljsglobal_p.h parser/qqmljskeywords_p.h parser/qqmljslexer.cpp parser/qqmljslexer_p.h - parser/qqmljssourcelocation_p.h qml/ftw/qbitfield_p.h qml/ftw/qfieldlist_p.h qml/ftw/qfinitestack_p.h @@ -325,10 +325,10 @@ qt_process_qlalr( ) #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: -# IMPORT_VERSION = "2.15" # QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml" # QML_IMPORT_NAME = "QtQml" +# QML_IMPORT_VERSION = "$$QT_VERSION" ## Scopes: ##################################################################### @@ -497,7 +497,7 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_locale qt_extend_target(Qml CONDITION ANDROID DEFINES - LIBS_SUFFIX='\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\"' + LIBS_SUFFIX="_${CMAKE_SYSTEM_PROCESSOR}.so" ) qt_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_) @@ -611,7 +611,7 @@ qt_add_docs(Qml set_target_properties(Qml PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml" ) diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index 4d20ee1081..3240e48092 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -55,6 +55,7 @@ qt_add_module(Qml common/qqmljsdiagnosticmessage_p.h common/qqmljsfixedpoolarray_p.h common/qqmljsmemorypool_p.h + common/qqmljssourcelocation_p.h common/qv4alloca_p.h common/qv4calldata_p.h common/qv4compileddata_p.h @@ -163,7 +164,6 @@ qt_add_module(Qml parser/qqmljsglobal_p.h parser/qqmljskeywords_p.h parser/qqmljslexer.cpp parser/qqmljslexer_p.h - parser/qqmljssourcelocation_p.h qml/ftw/qbitfield_p.h qml/ftw/qfieldlist_p.h qml/ftw/qfinitestack_p.h @@ -332,10 +332,10 @@ qt_declarative_generate_reg_exp_jit_tables(Qml) # special case end #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: -# IMPORT_VERSION = "2.15" # QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml" # QML_IMPORT_NAME = "QtQml" +# QML_IMPORT_VERSION = "$$QT_VERSION" ## Scopes: ##################################################################### @@ -504,7 +504,7 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_locale qt_extend_target(Qml CONDITION ANDROID DEFINES - LIBS_SUFFIX='\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\"' + LIBS_SUFFIX="_${CMAKE_SYSTEM_PROCESSOR}.so" ) qt_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_) @@ -618,7 +618,7 @@ qt_add_docs(Qml set_target_properties(Qml PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml" ) diff --git a/src/qmldebug/CMakeLists.txt b/src/qmldebug/CMakeLists.txt index e1502e02d1..da27e1da49 100644 --- a/src/qmldebug/CMakeLists.txt +++ b/src/qmldebug/CMakeLists.txt @@ -12,6 +12,7 @@ qt_add_module(QmlDebug qqmldebugclient_p_p.h qqmldebugconnection.cpp qqmldebugconnection_p.h qqmldebugmessageclient.cpp qqmldebugmessageclient_p.h + qqmldebugtranslationclient.cpp qqmldebugtranslationclient_p.h qqmlenginecontrolclient.cpp qqmlenginecontrolclient_p.h qqmlenginecontrolclient_p_p.h qqmlenginedebugclient.cpp qqmlenginedebugclient_p.h @@ -34,4 +35,5 @@ qt_add_module(QmlDebug Qt::CorePrivate Qt::Network Qt::PacketProtocolPrivate + Qt::QmlPrivate ) diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt index 702fa3be59..a1f121d6d0 100644 --- a/src/qmldevtools/.prev_CMakeLists.txt +++ b/src/qmldevtools/.prev_CMakeLists.txt @@ -13,6 +13,7 @@ qt_add_module(QmlDevTools ../qml/common/qqmljsdiagnosticmessage_p.h ../qml/common/qqmljsfixedpoolarray_p.h ../qml/common/qqmljsmemorypool_p.h + ../qml/common/qqmljssourcelocation_p.h ../qml/common/qv4alloca_p.h ../qml/common/qv4calldata_p.h ../qml/common/qv4compileddata_p.h @@ -36,7 +37,6 @@ qt_add_module(QmlDevTools ../qml/parser/qqmljsglobal_p.h ../qml/parser/qqmljskeywords_p.h ../qml/parser/qqmljslexer.cpp ../qml/parser/qqmljslexer_p.h - ../qml/parser/qqmljssourcelocation_p.h ../qml/qmldirparser/qqmldirparser.cpp ../qml/qmldirparser/qqmldirparser_p.h INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/../qml diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt index 439b89dcec..b0dba5c396 100644 --- a/src/qmldevtools/CMakeLists.txt +++ b/src/qmldevtools/CMakeLists.txt @@ -13,6 +13,7 @@ qt_add_module(QmlDevTools ../qml/common/qqmljsdiagnosticmessage_p.h ../qml/common/qqmljsfixedpoolarray_p.h ../qml/common/qqmljsmemorypool_p.h + ../qml/common/qqmljssourcelocation_p.h ../qml/common/qv4alloca_p.h ../qml/common/qv4calldata_p.h ../qml/common/qv4compileddata_p.h @@ -36,7 +37,6 @@ qt_add_module(QmlDevTools ../qml/parser/qqmljsglobal_p.h ../qml/parser/qqmljskeywords_p.h ../qml/parser/qqmljslexer.cpp ../qml/parser/qqmljslexer_p.h - ../qml/parser/qqmljssourcelocation_p.h ../qml/qmldirparser/qqmldirparser.cpp ../qml/qmldirparser/qqmldirparser_p.h INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/../qml diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt index a96f115ac2..069ea4a01e 100644 --- a/src/qmlmodels/CMakeLists.txt +++ b/src/qmlmodels/CMakeLists.txt @@ -26,10 +26,10 @@ qt_add_module(QmlModels ) #### Keys ignored in scope 1:.:.:qmlmodels.pro:<TRUE>: -# IMPORT_VERSION = "2.15" # QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/Models" # QML_IMPORT_NAME = "QtQml.Models" +# QML_IMPORT_VERSION = "$$QT_VERSION" ## Scopes: ##################################################################### @@ -70,7 +70,7 @@ qt_add_docs(QmlModels set_target_properties(QmlModels PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml.Models QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/Models" ) diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt index 0b48e41a13..ad1a578f14 100644 --- a/src/qmlworkerscript/.prev_CMakeLists.txt +++ b/src/qmlworkerscript/.prev_CMakeLists.txt @@ -49,10 +49,10 @@ qt_add_module(QmlWorkerScript ) #### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: -# IMPORT_VERSION = "2.15" # QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript" # QML_IMPORT_NAME = "QtQml.WorkerScript" +# QML_IMPORT_VERSION = "$$QT_VERSION" ## Scopes: ##################################################################### @@ -106,7 +106,7 @@ qt_add_docs(QmlWorkerScript set_target_properties(QmlWorkerScript PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml.WorkerScript QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" ) diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index d5e83794e5..e85d1174e1 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -49,10 +49,10 @@ qt_add_module(QmlWorkerScript ) #### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: -# IMPORT_VERSION = "2.15" # QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript" # QML_IMPORT_NAME = "QtQml.WorkerScript" +# QML_IMPORT_VERSION = "$$QT_VERSION" ## Scopes: ##################################################################### @@ -106,7 +106,7 @@ qt_add_docs(QmlWorkerScript set_target_properties(QmlWorkerScript PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml.WorkerScript QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" ) diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index aa08c89170..bffe111828 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -343,20 +343,16 @@ qt_add_resource(Quick "items" if(ANDROID) - set_property(TARGET Quick APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES - lib/libQt5QuickParticles.so - ) set_property(TARGET Quick APPEND PROPERTY QT_ANDROID_BUNDLED_FILES - lib/libQt5QuickParticles.so qml ) endif() #### Keys ignored in scope 1:.:.:quick.pro:<TRUE>: -# IMPORT_VERSION = "2.15" # QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick" # QML_IMPORT_NAME = "QtQuick" +# QML_IMPORT_VERSION = "$$QT_VERSION" ## Scopes: ##################################################################### @@ -369,6 +365,8 @@ qt_extend_target(Quick CONDITION QT_FEATURE_qml_network qt_extend_target(Quick CONDITION QT_FEATURE_opengl LIBRARIES Qt::OpenGLPrivate + PUBLIC_LIBRARIES + Qt::OpenGL ) qt_extend_target(Quick CONDITION MSVC @@ -610,7 +608,7 @@ qt_add_docs(Quick set_target_properties(Quick PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQuick QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick" ) diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt index 641875e6d0..3287fb1dd5 100644 --- a/src/quickshapes/CMakeLists.txt +++ b/src/quickshapes/CMakeLists.txt @@ -55,10 +55,10 @@ qt_add_resource(QuickShapes "qtquickshapes" #### Keys ignored in scope 1:.:.:quickshapes.pro:<TRUE>: -# IMPORT_VERSION = "1.15" # QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick/Shapes" # QML_IMPORT_NAME = "QtQuick.Shapes" +# QML_IMPORT_VERSION = "$$QT_VERSION" ## Scopes: ##################################################################### @@ -72,7 +72,7 @@ qt_extend_target(QuickShapes CONDITION QT_FEATURE_opengl set_target_properties(QuickShapes PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION 1.15 + QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQuick.Shapes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Shapes" ) |