diff options
86 files changed, 546 insertions, 209 deletions
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt new file mode 100644 index 0000000000..9117c6e684 --- /dev/null +++ b/.prev_CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from qtdeclarative.pro. + +cmake_minimum_required(VERSION 3.15.0) + +project(declarative_FIXME + VERSION 6.0.0 + DESCRIPTION "Qt declarative_FIXME Libraries" + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C +) + +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) +find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) + +if(NOT QT_FEATURE_commandlineparser) + message(NOTICE "Skipping the build as the condition \"QT_FEATURE_commandlineparser\" is not met.") + return() +endif() +if(NOT QT_FEATURE_temporaryfile) + message(NOTICE "Skipping the build as the condition \"QT_FEATURE_temporaryfile\" is not met.") + return() +endif() +qt_build_repo() diff --git a/CMakeLists.txt b/CMakeLists.txt index cfd53e07b8..3e82176a60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,10 @@ +# Generated from qtdeclarative.pro. + cmake_minimum_required(VERSION 3.15.0) -project(QtDeclarative +project(QtDeclarative # special case VERSION 6.0.0 - DESCRIPTION "Qt Declarative Libraries" + DESCRIPTION "Qt Declarative Libraries" # special case HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C ) @@ -10,7 +12,17 @@ project(QtDeclarative find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui Widgets Network # special case OPTIONAL_COMPONENTS OpenGL Sql Concurrent Test) # special case +# special case begin # export QT6_ADD_QML_MODULE to this project include(src/qml/Qt6QmlMacros.cmake) +# special case end +if(NOT QT_FEATURE_commandlineparser) + message(NOTICE "Skipping the build as the condition \"QT_FEATURE_commandlineparser\" is not met.") + return() +endif() +if(NOT QT_FEATURE_temporaryfile) + message(NOTICE "Skipping the build as the condition \"QT_FEATURE_temporaryfile\" is not met.") + return() +endif() qt_build_repo() diff --git a/examples/quick/CMakeLists.txt b/examples/quick/CMakeLists.txt index 5299e95ae2..8940ff9c70 100644 --- a/examples/quick/CMakeLists.txt +++ b/examples/quick/CMakeLists.txt @@ -35,6 +35,6 @@ endif() if(TARGET Qt::Widgets) add_subdirectory(embeddedinwidgets) endif() -if(TARGET Qt::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3) AND (QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 OR TARGET Qt::QuickWidgets)) +if(TARGET Qt::QuickWidgets AND TARGET Qt::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) add_subdirectory(quickwidgets) endif() diff --git a/examples/quick/scenegraph/CMakeLists.txt b/examples/quick/scenegraph/CMakeLists.txt index c868b34938..6dbec6c251 100644 --- a/examples/quick/scenegraph/CMakeLists.txt +++ b/examples/quick/scenegraph/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from scenegraph.pro. add_subdirectory(customgeometry) -add_subdirectory(rendernode) +# add_subdirectory(rendernode) # special case needs fixing add_subdirectory(threadedanimation) if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3) add_subdirectory(graph) @@ -13,7 +13,7 @@ if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3) add_subdirectory(twotextureproviders) endif() if(APPLE_OSX) - add_subdirectory(metalunderqml) + # add_subdirectory(metalunderqml) # special case needs fixing # add_subdirectory(metaltextureimport) # special case TODO endif() if(WIN32) diff --git a/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt b/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt index 08a527f4b8..d84885f4cf 100644 --- a/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt +++ b/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt @@ -54,3 +54,11 @@ install(TARGETS metaltextureimport BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) + +set_target_properties(metaltextureimport PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 1.0 + QT_QML_MODULE_URI MetalTextureImport +) + +qt6_qml_type_registration(metaltextureimport) diff --git a/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt b/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt index 65442e3790..450af3d5f3 100644 --- a/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt +++ b/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt @@ -47,3 +47,11 @@ install(TARGETS vulkanunderqml BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) + +set_target_properties(vulkanunderqml PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 1.0 + QT_QML_MODULE_URI VulkanUnderQML +) + +qt6_qml_type_registration(vulkanunderqml) 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" ) diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt index c134c8d454..221413713e 100644 --- a/tests/.prev_CMakeLists.txt +++ b/tests/.prev_CMakeLists.txt @@ -1,6 +1,7 @@ # Generated from tests.pro. -add_subdirectory(auto) -if(QT_CONFIG___contains___release) - add_subdirectory(benchmarks) +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. endif() +qt_build_tests() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index eeddbe0780..221413713e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,12 +1,7 @@ -# special case begin -if(NOT TARGET Qt::Test) - cmake_minimum_required(VERSION 3.15.0) - project(QtDeclarativeTests VERSION 6.0.0 LANGUAGES C CXX ASM) - find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Test Qml Quick QuickParticles - QmlDevTools QuickWidgets QmlDebug QuickTest QuickShapes - QmlWorkerScript Concurrent) - qt_set_up_standalone_tests_build() -endif() -# special case end +# Generated from tests.pro. +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. +endif() qt_build_tests() diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt new file mode 100644 index 0000000000..956a863283 --- /dev/null +++ b/tests/auto/.prev_CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from auto.pro. + +add_subdirectory(qml) +add_subdirectory(quick) +add_subdirectory(quicktest) +add_subdirectory(qmldevtools) +add_subdirectory(cmake) +add_subdirectory(installed_cmake) +add_subdirectory(toolsupport) +if(NOT APPLE_UIKIT) + add_subdirectory(qmltest) +endif() +if(TARGET Qt::Gui AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) + add_subdirectory(particles) +endif() +if(TARGET Qt::Gui AND TARGET Qt::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) + add_subdirectory(quickwidgets) +endif() diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 106a7fe10e..702f646bd4 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -4,17 +4,17 @@ add_subdirectory(qml) add_subdirectory(quick) add_subdirectory(quicktest) add_subdirectory(qmldevtools) -# add_subdirectory(cmake) # special case remove # special case begin +# add_subdirectory(cmake) # add_subdirectory(installed_cmake) # special case end add_subdirectory(toolsupport) if(NOT APPLE_UIKIT) add_subdirectory(qmltest) endif() -if(QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 OR (QT_FEATURE_opengl AND TARGET Qt::Gui)) +if(TARGET Qt::Gui AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) add_subdirectory(particles) endif() -if(QT_FEATURE_opengles2 OR (QT_FEATURE_opengl AND TARGET Qt::Gui) OR (QT_FEATURE_opengles3 AND TARGET Qt::Widgets)) +if(TARGET Qt::Gui AND TARGET Qt::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) add_subdirectory(quickwidgets) endif() diff --git a/tests/auto/qml/.prev_CMakeLists.txt b/tests/auto/qml/.prev_CMakeLists.txt new file mode 100644 index 0000000000..3f453e4ded --- /dev/null +++ b/tests/auto/qml/.prev_CMakeLists.txt @@ -0,0 +1,82 @@ +# Generated from qml.pro. + +add_subdirectory(parserstress) +add_subdirectory(qjsvalueiterator) +add_subdirectory(qjsonbinding) +add_subdirectory(qqmlfile) +add_subdirectory(qqmlfileselector) +add_subdirectory(qqmlcomponent) +add_subdirectory(qqmlconsole) +add_subdirectory(qqmlengine) +add_subdirectory(qqmlerror) +add_subdirectory(qqmlincubator) +add_subdirectory(qqmlinfo) +add_subdirectory(qqmllistreference) +add_subdirectory(qqmllocale) +add_subdirectory(qqmlmetaobject) +add_subdirectory(qqmlmoduleplugin) +add_subdirectory(qqmlnotifier) +add_subdirectory(qqmlqt) +add_subdirectory(qqmlxmlhttprequest) +add_subdirectory(qqmlpromise) +add_subdirectory(qtqmlmodules) +add_subdirectory(qquickfolderlistmodel) +add_subdirectory(qqmlapplicationengine) +add_subdirectory(qqmlsettings) +add_subdirectory(qqmlstatemachine) +add_subdirectory(qmldiskcache) +add_subdirectory(qqmlmetatype) +if(QT_FEATURE_process AND QT_FEATURE_qml_debug) + add_subdirectory(debugger) +endif() +if(QT_FEATURE_process AND NOT boot2qt) + add_subdirectory(qmlformat) + add_subdirectory(qmllint) + add_subdirectory(qmlplugindump) +endif() +if(QT_FEATURE_library) + add_subdirectory(qqmlextensionplugin) +endif() +if(QT_FEATURE_private_tests) + add_subdirectory(qqmlcpputils) + add_subdirectory(qqmldirparser) + add_subdirectory(qmlcachegen) + add_subdirectory(animation) + add_subdirectory(qqmlecmascript) + add_subdirectory(qqmlcontext) + add_subdirectory(qqmlexpression) + add_subdirectory(qqmlglobal) + add_subdirectory(qqmllanguage) + add_subdirectory(qqmlopenmetaobject) + add_subdirectory(qqmlproperty) + add_subdirectory(qqmlpropertycache) + add_subdirectory(qqmlpropertymap) + add_subdirectory(qqmlsqldatabase) + add_subdirectory(qqmlvaluetypes) + add_subdirectory(qqmlvaluetypeproviders) + add_subdirectory(qqmlbinding) + add_subdirectory(qqmlchangeset) + add_subdirectory(qqmlconnections) + add_subdirectory(qqmllistcompositor) + add_subdirectory(qqmllistmodel) + add_subdirectory(qqmllistmodelworkerscript) + add_subdirectory(qqmlitemmodels) + add_subdirectory(qqmltypeloader) + add_subdirectory(qqmlparser) + add_subdirectory(qquickworkerscript) + add_subdirectory(qrcqml) + add_subdirectory(qqmltimer) + add_subdirectory(qqmlinstantiator) + add_subdirectory(qqmlenginecleanup) + add_subdirectory(qqmltranslation) + add_subdirectory(qqmlimport) + add_subdirectory(qqmlobjectmodel) + add_subdirectory(qqmltablemodel) + add_subdirectory(qv4assembler) + add_subdirectory(qv4mm) + add_subdirectory(qv4identifiertable) + add_subdirectory(qv4regexp) + add_subdirectory(ecmascripttests) + add_subdirectory(bindingdependencyapi) + add_subdirectory(v4misc) +endif() diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt index cccfe6105c..7592f09eba 100644 --- a/tests/auto/qml/CMakeLists.txt +++ b/tests/auto/qml/CMakeLists.txt @@ -30,6 +30,7 @@ if(QT_FEATURE_process AND QT_FEATURE_qml_debug) add_subdirectory(debugger) endif() if(QT_FEATURE_process AND NOT boot2qt) + add_subdirectory(qmlformat) add_subdirectory(qmllint) add_subdirectory(qmlplugindump) endif() diff --git a/tests/auto/qml/debugger/CMakeLists.txt b/tests/auto/qml/debugger/CMakeLists.txt index 7c0bd2e1cb..871f11820e 100644 --- a/tests/auto/qml/debugger/CMakeLists.txt +++ b/tests/auto/qml/debugger/CMakeLists.txt @@ -2,6 +2,7 @@ add_subdirectory(qqmldebugjsserver) add_subdirectory(qdebugmessageservice) +add_subdirectory(qqmldebugtranslationservice) add_subdirectory(qqmlenginedebugservice) add_subdirectory(qqmldebugjs) add_subdirectory(qqmlinspector) diff --git a/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt new file mode 100644 index 0000000000..7290b1e417 --- /dev/null +++ b/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from qqmldebugtranslationservice.pro. + +##################################################################### +## tst_qdebugtranslationservice Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + +qt_add_test(tst_qdebugtranslationservice + SOURCES + ../../../shared/util.cpp ../../../shared/util.h + ../shared/debugutil.cpp ../shared/debugutil_p.h + ../shared/qqmldebugprocess.cpp ../shared/qqmldebugprocess_p.h + tst_qqmldebugtranslationservice.cpp + INCLUDE_DIRECTORIES + ../../../shared + ../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlDebugPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qqmldebugtranslationservice.pro:<TRUE>: +# OTHER_FILES = "data/test.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qdebugtranslationservice CONDITION ANDROID OR APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qdebugtranslationservice CONDITION NOT ANDROID AND NOT APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/qml/ecmascripttests/CMakeLists.txt b/tests/auto/qml/ecmascripttests/CMakeLists.txt index 00357fb36b..06296fd91d 100644 --- a/tests/auto/qml/ecmascripttests/CMakeLists.txt +++ b/tests/auto/qml/ecmascripttests/CMakeLists.txt @@ -5,27 +5,20 @@ ##################################################################### add_qt_test(tst_ecmascripttests - GUI SOURCES qjstest/test262runner.cpp qjstest/test262runner.h tst_ecmascripttests.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES - Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 2:.:.:testcase.pro:<TRUE>: -# CONFIG = "testcase" # QT_TOOL_ENV = "checkenv" # checkenv.name = "QTEST_FUNCTION_TIMEOUT" # checkenv.value = "500000" ## Scopes: ##################################################################### - -#### Keys ignored in scope 3:.:.:testcase.pro:APPLE_OSX: -# CONFIG = "-app_bundle" add_subdirectory(qjstest) diff --git a/tests/auto/qml/qmlformat/CMakeLists.txt b/tests/auto/qml/qmlformat/CMakeLists.txt new file mode 100644 index 0000000000..483cc93aeb --- /dev/null +++ b/tests/auto/qml/qmlformat/CMakeLists.txt @@ -0,0 +1,37 @@ +# Generated from qmlformat.pro. + +##################################################################### +## tst_qmlformat Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + +qt_add_test(tst_qmlformat + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qmlformat.cpp + DEFINES + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::Gui + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qmlformat CONDITION ANDROID OR APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qmlformat CONDITION NOT ANDROID AND NOT APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/qml/qmlplugindump/CMakeLists.txt b/tests/auto/qml/qmlplugindump/CMakeLists.txt index f8204d1057..a5d0eb7429 100644 --- a/tests/auto/qml/qmlplugindump/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qmlplugindump - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qmlplugindump.cpp @@ -13,22 +12,14 @@ add_qt_test(tst_qmlplugindump QT_QMLTEST_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES - Qt::Gui + Qt::GuiPrivate Qt::Qml ) -#### Keys ignored in scope 2:.:.:tst_qmlplugindump.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 3:.:.:tst_qmlplugindump.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qmlplugindump CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt index 9508ebfa9b..c22b7485b6 100644 --- a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt +++ b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt @@ -5,51 +5,45 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlapplicationengine - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlapplicationengine.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Network - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) # Resources: +set(tst_qqmlapplicationengine_resource_files + "data/i18n/qml.qm" + "data/loadTranslation.qml" +) + add_qt_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine" PREFIX "/" FILES - data/i18n/qml.qm - data/loadTranslation.qml + ${tst_qqmlapplicationengine_resource_files} ) #### Keys ignored in scope 2:.:.:tst_qqmlapplicationengine.pro:<TRUE>: -# CONFIG = "testcase" # TRANSLATIONS = "data/i18n/qml_ja.ts" ## Scopes: ##################################################################### -#### Keys ignored in scope 3:.:.:tst_qqmlapplicationengine.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmllanguage/CMakeLists.txt b/tests/auto/qml/qqmllanguage/CMakeLists.txt index 2e2ad71601..682d35bb1b 100644 --- a/tests/auto/qml/qqmllanguage/CMakeLists.txt +++ b/tests/auto/qml/qqmllanguage/CMakeLists.txt @@ -29,6 +29,8 @@ qt_add_test(tst_qqmllanguage #### Keys ignored in scope 1:.:.:qqmllanguage.pro:<TRUE>: # OTHER_FILES = "data/readonlyObjectProperty.qml" +# QML_IMPORT_NAME = "StaticTest" +# QML_IMPORT_VERSION = "1.0" ## Scopes: ##################################################################### @@ -59,3 +61,11 @@ qt_extend_target(tst_qqmllanguage CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) + +set_target_properties(tst_qqmllanguage PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 1.0 + QT_QML_MODULE_URI StaticTest +) + +qt6_qml_type_registration(tst_qqmllanguage) diff --git a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt index 746774c593..3a1251655a 100644 --- a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt @@ -25,14 +25,11 @@ add_qt_test(tst_qqmlmoduleplugin tst_qqmlmoduleplugin.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Network - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt index 85538c3a89..975a424475 100644 --- a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt @@ -25,14 +25,11 @@ add_qt_test(tst_qqmlmoduleplugin tst_qqmlmoduleplugin.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Network - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlparser/CMakeLists.txt b/tests/auto/qml/qqmlparser/CMakeLists.txt index f6fad897ca..831fdff0e1 100644 --- a/tests/auto/qml/qqmlparser/CMakeLists.txt +++ b/tests/auto/qml/qqmlparser/CMakeLists.txt @@ -12,12 +12,13 @@ list(APPEND test_data ${test_data_glob}) qt_add_test(tst_qqmlparser SOURCES + ../../shared/qqmljsastdumper.cpp ../../shared/qqmljsastdumper.h ../../shared/util.cpp ../../shared/util.h tst_qqmlparser.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" INCLUDE_DIRECTORIES - ../../shared + ../../shared ../../shared PUBLIC_LIBRARIES Qt::Gui Qt::QmlPrivate diff --git a/tests/auto/qml/qqmlproperty/CMakeLists.txt b/tests/auto/qml/qqmlproperty/CMakeLists.txt index dbe648bd2f..5899210558 100644 --- a/tests/auto/qml/qqmlproperty/CMakeLists.txt +++ b/tests/auto/qml/qqmlproperty/CMakeLists.txt @@ -13,6 +13,7 @@ list(APPEND test_data ${test_data_glob}) qt_add_test(tst_qqmlproperty SOURCES ../../shared/util.cpp ../../shared/util.h + interfaces.h tst_qqmlproperty.cpp INCLUDE_DIRECTORIES ../../shared @@ -24,6 +25,10 @@ qt_add_test(tst_qqmlproperty TESTDATA ${test_data} ) +#### Keys ignored in scope 1:.:.:qqmlproperty.pro:<TRUE>: +# QML_IMPORT_NAME = "io.qt.bugreports" +# QML_IMPORT_VERSION = "2.0" + ## Scopes: ##################################################################### @@ -36,3 +41,11 @@ qt_extend_target(tst_qqmlproperty CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) + +set_target_properties(tst_qqmlproperty PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 2.0 + QT_QML_MODULE_URI io.qt.bugreports +) + +qt6_qml_type_registration(tst_qqmlproperty) diff --git a/tests/auto/quick/.prev_CMakeLists.txt b/tests/auto/quick/.prev_CMakeLists.txt new file mode 100644 index 0000000000..488150c61c --- /dev/null +++ b/tests/auto/quick/.prev_CMakeLists.txt @@ -0,0 +1,68 @@ +# Generated from quick.pro. + +add_subdirectory(geometry) +add_subdirectory(qquickpixmapcache) +if(QT_FEATURE_private_tests) + add_subdirectory(nokeywords) + add_subdirectory(propertyrequirements) + add_subdirectory(qquickanimations) + add_subdirectory(qquickapplication) + add_subdirectory(qquickbehaviors) + add_subdirectory(qquickboundaryrule) + add_subdirectory(qquickfontloader) + add_subdirectory(qquickfontloader_static) + add_subdirectory(qquickfontmetrics) + add_subdirectory(qquickimageprovider) + add_subdirectory(qquicklayouts) + add_subdirectory(qquickpath) + add_subdirectory(qquicksmoothedanimation) + add_subdirectory(qquickspringanimation) + add_subdirectory(qquickanimationcontroller) + add_subdirectory(qquickstyledtext) + add_subdirectory(qquickstates) + add_subdirectory(qquicksystempalette) + add_subdirectory(qquicktimeline) + add_subdirectory(pointerhandlers) + add_subdirectory(qquickaccessible) + add_subdirectory(qquickanchors) + add_subdirectory(qquickanimatedimage) + add_subdirectory(qquickdynamicpropertyanimation) + add_subdirectory(qquickborderimage) + add_subdirectory(qquickwindow) + add_subdirectory(qquickdrag) + add_subdirectory(qquickdroparea) + add_subdirectory(qquickflickable) + add_subdirectory(qquickflipable) + add_subdirectory(qquickfocusscope) + add_subdirectory(qquickgraphicsinfo) + add_subdirectory(qquickgridview) + add_subdirectory(qquickimage) + add_subdirectory(qquickitem) + add_subdirectory(qquickitem2) + add_subdirectory(qquickitemlayer) + add_subdirectory(qquicklistview) + add_subdirectory(qquicktableview) + add_subdirectory(qquickloader) + add_subdirectory(qquickmousearea) + add_subdirectory(qquickmultipointtoucharea) + add_subdirectory(qquickpainteditem) + add_subdirectory(qquickshape) + add_subdirectory(qquickpathview) + add_subdirectory(qquickpincharea) + add_subdirectory(qquickpositioners) + add_subdirectory(qquickrectangle) + add_subdirectory(qquickrepeater) + add_subdirectory(qquickshortcut) + add_subdirectory(qquicktext) + add_subdirectory(qquicktextdocument) + add_subdirectory(qquicktextedit) + add_subdirectory(qquicktextinput) + add_subdirectory(qquickvisualdatamodel) + add_subdirectory(qquickview) + add_subdirectory(qquickcanvasitem) + add_subdirectory(qquickdesignersupport) + add_subdirectory(qquickscreen) + add_subdirectory(touchmouse) + add_subdirectory(scenegraph) + add_subdirectory(sharedimage) +endif() diff --git a/tests/auto/quick/pointerhandlers/CMakeLists.txt b/tests/auto/quick/pointerhandlers/CMakeLists.txt index be23ca12ad..f8ac22d531 100644 --- a/tests/auto/quick/pointerhandlers/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/CMakeLists.txt @@ -2,6 +2,7 @@ if(QT_FEATURE_private_tests) add_subdirectory(flickableinterop) + add_subdirectory(mousearea_interop) add_subdirectory(multipointtoucharea_interop) add_subdirectory(qquickdraghandler) add_subdirectory(qquickhoverhandler) diff --git a/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt index 0cc44921f4..06cce61350 100644 --- a/tests/benchmarks/CMakeLists.txt +++ b/tests/benchmarks/CMakeLists.txt @@ -2,6 +2,6 @@ add_subdirectory(qml) add_subdirectory(quick) -if(QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 OR (QT_FEATURE_opengl AND QT_FEATURE_private_tests)) +if(QT_FEATURE_private_tests AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) add_subdirectory(particles) endif() diff --git a/tests/benchmarks/qml/painting/CMakeLists.txt b/tests/benchmarks/qml/painting/CMakeLists.txt index 93ae5e9ef7..aa126450a6 100644 --- a/tests/benchmarks/qml/painting/CMakeLists.txt +++ b/tests/benchmarks/qml/painting/CMakeLists.txt @@ -10,6 +10,7 @@ qt_add_benchmark(painting PUBLIC_LIBRARIES Qt::Gui Qt::OpenGL + Qt::OpenGLWidgets Qt::Widgets ) diff --git a/tests/manual/pointer/CMakeLists.txt b/tests/manual/pointer/CMakeLists.txt index c11611ed7e..e58fc7f29f 100644 --- a/tests/manual/pointer/CMakeLists.txt +++ b/tests/manual/pointer/CMakeLists.txt @@ -47,6 +47,10 @@ set(qml_resource_files "pointerDrag.qml" "resources/arrowhead.png" "resources/balloon.png" + "resources/cursor-airbrush.png" + "resources/cursor-eraser.png" + "resources/cursor-felt-marker.png" + "resources/cursor-pencil.png" "resources/fighter.png" "resources/fingersprite.png" "resources/grabbing-location.svg" @@ -61,6 +65,7 @@ set(qml_resource_files "resources/redball.png" "sidebar.qml" "singlePointHandlerProperties.qml" + "tabletCanvasDrawing.qml" "tapHandler.qml" ) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 258a4a7569..b1c05782b3 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -4,6 +4,7 @@ if(QT_FEATURE_qml_devtools) add_subdirectory(qmllint) add_subdirectory(qmlimportscanner) + add_subdirectory(qmlformat) # special case: Do not build qmlcachegen here but build it at src/ # time, so that we can use it for our own .qml files in src/imports. endif() diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt index 31d9a65396..b9b93d02d3 100644 --- a/tools/qml/.prev_CMakeLists.txt +++ b/tools/qml/.prev_CMakeLists.txt @@ -8,11 +8,9 @@ qt_add_tool(qml SOURCES conf.h main.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Qml ) # Resources: @@ -35,6 +33,8 @@ qt_add_resource(qml "qml" #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: # ICON = "resources/qml-64.png" # QMAKE_TARGET_DESCRIPTION = "QML" "Runtime" +# QML_IMPORT_NAME = "QmlRuntime.Config" +# QML_IMPORT_VERSION = "1.0" ## Scopes: ##################################################################### @@ -61,3 +61,11 @@ qt_extend_target(qml CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) + +set_target_properties(qml PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 1.0 + QT_QML_MODULE_URI QmlRuntime.Config +) + +qt6_qml_type_registration(qml) diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt index 6727f51a92..6edf190389 100644 --- a/tools/qml/CMakeLists.txt +++ b/tools/qml/CMakeLists.txt @@ -9,14 +9,18 @@ qt_add_tool(qml SOURCES conf.h main.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Qml ) # special case begin +# Don't set properties on a host tool when cross compiling, because it +# is not being built. +if(CMAKE_CROSSCOMPILING) + return() +endif() + set_source_files_properties( conf/default.qml conf/resizeToItem.qml @@ -46,6 +50,8 @@ qt_add_resource(qml "qml" #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: # ICON = "resources/qml-64.png" # QMAKE_TARGET_DESCRIPTION = "QML" "Runtime" +# QML_IMPORT_NAME = "QmlRuntime.Config" +# QML_IMPORT_VERSION = "1.0" ## Scopes: ##################################################################### @@ -72,3 +78,11 @@ qt_extend_target(qml CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) + +set_target_properties(qml PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 1.0 + QT_QML_MODULE_URI QmlRuntime.Config +) +qt6_qml_type_registration(qml) + diff --git a/tools/qmlcachegen/.prev_CMakeLists.txt b/tools/qmlcachegen/.prev_CMakeLists.txt index d8248b40ba..40ba09bc07 100644 --- a/tools/qmlcachegen/.prev_CMakeLists.txt +++ b/tools/qmlcachegen/.prev_CMakeLists.txt @@ -16,10 +16,8 @@ qt_add_tool(qmlcachegen QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES - Qt::QmlDevTools + Qt::QmlDevToolsPrivate ) #### Keys ignored in scope 1:.:.:qmlcachegen.pro:<TRUE>: diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt index aa9215fd49..29302c1ef6 100644 --- a/tools/qmlcachegen/CMakeLists.txt +++ b/tools/qmlcachegen/CMakeLists.txt @@ -17,10 +17,8 @@ qt_add_tool(qmlcachegen QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES - Qt::QmlDevTools + Qt::QmlDevToolsPrivate ) #### Keys ignored in scope 1:.:.:qmlcachegen.pro:<TRUE>: diff --git a/tools/qmlformat/.prev_CMakeLists.txt b/tools/qmlformat/.prev_CMakeLists.txt new file mode 100644 index 0000000000..4f1f038f9b --- /dev/null +++ b/tools/qmlformat/.prev_CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from qmlformat.pro. + +##################################################################### +## qmlformat Tool: +##################################################################### + +qt_add_tool(qmlformat + SOURCES + commentastvisitor.cpp commentastvisitor.h + dumpastvisitor.cpp dumpastvisitor.h + main.cpp + restructureastvisitor.cpp restructureastvisitor.h + PUBLIC_LIBRARIES + Qt::QmlDevToolsPrivate +) + +#### Keys ignored in scope 1:.:.:qmlformat.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Formatter" +# _OPTION = "host_build" diff --git a/tools/qmlformat/CMakeLists.txt b/tools/qmlformat/CMakeLists.txt new file mode 100644 index 0000000000..b83b8745d2 --- /dev/null +++ b/tools/qmlformat/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qmlformat.pro. + +##################################################################### +## qmlformat Tool: +##################################################################### + +qt_add_tool(qmlformat + TOOLS_TARGET Qml # special case + SOURCES + commentastvisitor.cpp commentastvisitor.h + dumpastvisitor.cpp dumpastvisitor.h + main.cpp + restructureastvisitor.cpp restructureastvisitor.h + PUBLIC_LIBRARIES + Qt::QmlDevToolsPrivate +) + +#### Keys ignored in scope 1:.:.:qmlformat.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Formatter" +# _OPTION = "host_build" diff --git a/tools/qmlimportscanner/.prev_CMakeLists.txt b/tools/qmlimportscanner/.prev_CMakeLists.txt index e69eb179d8..fbab757807 100644 --- a/tools/qmlimportscanner/.prev_CMakeLists.txt +++ b/tools/qmlimportscanner/.prev_CMakeLists.txt @@ -14,16 +14,14 @@ qt_add_tool(qmlimportscanner QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES - Qt::QmlDevTools + Qt::QmlDevToolsPrivate ) #### Keys ignored in scope 1:.:.:qmlimportscanner.pro:<TRUE>: # CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])" # CMAKE_DEBUG_TYPE = <EMPTY> -# CMAKE_QML_DIR = "$$cmakeRelativePath($$[QT_INSTALL_QML/get], $$[QT_INSTALL_PREFIX])" +# CMAKE_QML_DIR = "$$cmakeRelativePath($$[QT_INSTALL_QML], $$[QT_INSTALL_PREFIX])" # CMAKE_QML_PLUGIN_SUFFIX_RELEASE = <EMPTY> # CMAKE_RELEASE_TYPE = <EMPTY> # QMAKE_SUBSTITUTES = "cmake_config_file" @@ -42,7 +40,7 @@ qt_add_tool(qmlimportscanner # CMAKE_BIN_DIR_IS_ABSOLUTE = "True" #### Keys ignored in scope 3:.:.:qmlimportscanner.pro:CMAKE_QML_DIR___contains___^\\.\\./._x_: -# CMAKE_QML_DIR = "$$[QT_INSTALL_QML/get]/" +# CMAKE_QML_DIR = "$$[QT_INSTALL_QML]/" # CMAKE_QML_DIR_IS_ABSOLUTE = "True" #### Keys ignored in scope 4:.:.:qmlimportscanner.pro:static OR staticlib: diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt index 4bbc8d0eee..30a4babfcd 100644 --- a/tools/qmlimportscanner/CMakeLists.txt +++ b/tools/qmlimportscanner/CMakeLists.txt @@ -15,16 +15,14 @@ qt_add_tool(qmlimportscanner QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES - Qt::QmlDevTools + Qt::QmlDevToolsPrivate ) #### Keys ignored in scope 1:.:.:qmlimportscanner.pro:<TRUE>: # CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])" # CMAKE_DEBUG_TYPE = <EMPTY> -# CMAKE_QML_DIR = "$$cmakeRelativePath($$[QT_INSTALL_QML/get], $$[QT_INSTALL_PREFIX])" +# CMAKE_QML_DIR = "$$cmakeRelativePath($$[QT_INSTALL_QML], $$[QT_INSTALL_PREFIX])" # CMAKE_QML_PLUGIN_SUFFIX_RELEASE = <EMPTY> # CMAKE_RELEASE_TYPE = <EMPTY> # QMAKE_SUBSTITUTES = "cmake_config_file" @@ -43,7 +41,7 @@ qt_add_tool(qmlimportscanner # CMAKE_BIN_DIR_IS_ABSOLUTE = "True" #### Keys ignored in scope 3:.:.:qmlimportscanner.pro:CMAKE_QML_DIR___contains___^\\.\\./._x_: -# CMAKE_QML_DIR = "$$[QT_INSTALL_QML/get]/" +# CMAKE_QML_DIR = "$$[QT_INSTALL_QML]/" # CMAKE_QML_DIR_IS_ABSOLUTE = "True" #### Keys ignored in scope 4:.:.:qmlimportscanner.pro:static OR staticlib: diff --git a/tools/qmljs/.prev_CMakeLists.txt b/tools/qmljs/.prev_CMakeLists.txt index 0f845fa3ed..0096f335ae 100644 --- a/tools/qmljs/.prev_CMakeLists.txt +++ b/tools/qmljs/.prev_CMakeLists.txt @@ -31,11 +31,9 @@ qt_add_tool(qmljs ../../src/3rdparty/masm/stubs/runtime ../../src/3rdparty/masm/stubs/wtf ../../src/3rdparty/masm/wtf - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Qml ) #### Keys ignored in scope 1:.:.:qmljs.pro:<TRUE>: diff --git a/tools/qmljs/CMakeLists.txt b/tools/qmljs/CMakeLists.txt index 4655bfb9fc..a972a8ba1b 100644 --- a/tools/qmljs/CMakeLists.txt +++ b/tools/qmljs/CMakeLists.txt @@ -32,11 +32,9 @@ qt_add_tool(qmljs ../../src/3rdparty/masm/stubs/runtime ../../src/3rdparty/masm/stubs/wtf ../../src/3rdparty/masm/wtf - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Qml ) #### Keys ignored in scope 1:.:.:qmljs.pro:<TRUE>: diff --git a/tools/qmllint/.prev_CMakeLists.txt b/tools/qmllint/.prev_CMakeLists.txt index 9c44abe33b..9e3667fead 100644 --- a/tools/qmllint/.prev_CMakeLists.txt +++ b/tools/qmllint/.prev_CMakeLists.txt @@ -14,11 +14,9 @@ qt_add_tool(qmllint qcoloroutput.cpp qcoloroutput.h scopetree.cpp scopetree.h typedescriptionreader.cpp typedescriptionreader.h - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlDevToolsPrivate - PUBLIC_LIBRARIES - Qt::QmlDevTools ) #### Keys ignored in scope 1:.:.:qmllint.pro:<TRUE>: diff --git a/tools/qmllint/CMakeLists.txt b/tools/qmllint/CMakeLists.txt index ef06ec4abb..d4b0aad760 100644 --- a/tools/qmllint/CMakeLists.txt +++ b/tools/qmllint/CMakeLists.txt @@ -15,11 +15,9 @@ qt_add_tool(qmllint qcoloroutput.cpp qcoloroutput.h scopetree.cpp scopetree.h typedescriptionreader.cpp typedescriptionreader.h - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlDevToolsPrivate - PUBLIC_LIBRARIES - Qt::QmlDevTools ) #### Keys ignored in scope 1:.:.:qmllint.pro:<TRUE>: diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt index c5a8d1b1c1..c161a13077 100644 --- a/tools/qmlplugindump/.prev_CMakeLists.txt +++ b/tools/qmlplugindump/.prev_CMakeLists.txt @@ -11,14 +11,12 @@ qt_add_tool(qmlplugindump qmltypereader.cpp qmltypereader.h INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::CorePrivate - Qt::QmlPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Qml - Qt::Quick + Qt::QmlPrivate + Qt::QuickPrivate ) #### Keys ignored in scope 1:.:.:qmlplugindump.pro:<TRUE>: diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt index 6f1af762cd..c2a84fcccc 100644 --- a/tools/qmlplugindump/CMakeLists.txt +++ b/tools/qmlplugindump/CMakeLists.txt @@ -12,14 +12,12 @@ qt_add_tool(qmlplugindump qmltypereader.cpp qmltypereader.h INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::CorePrivate - Qt::QmlPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Qml - Qt::Quick + Qt::QmlPrivate + Qt::QuickPrivate ) #### Keys ignored in scope 1:.:.:qmlplugindump.pro:<TRUE>: diff --git a/tools/qmlpreview/.prev_CMakeLists.txt b/tools/qmlpreview/.prev_CMakeLists.txt index 87754e3ff0..05eb333bb2 100644 --- a/tools/qmlpreview/.prev_CMakeLists.txt +++ b/tools/qmlpreview/.prev_CMakeLists.txt @@ -9,11 +9,9 @@ qt_add_tool(qmlpreview main.cpp qmlpreviewapplication.cpp qmlpreviewapplication.h qmlpreviewfilesystemwatcher.cpp qmlpreviewfilesystemwatcher.h - LIBRARIES - Qt::QmlDebugPrivate PUBLIC_LIBRARIES Qt::Network - Qt::QmlDebug + Qt::QmlDebugPrivate ) #### Keys ignored in scope 1:.:.:qmlpreview.pro:<TRUE>: diff --git a/tools/qmlpreview/CMakeLists.txt b/tools/qmlpreview/CMakeLists.txt index b0885beee1..2adec05254 100644 --- a/tools/qmlpreview/CMakeLists.txt +++ b/tools/qmlpreview/CMakeLists.txt @@ -10,11 +10,9 @@ qt_add_tool(qmlpreview main.cpp qmlpreviewapplication.cpp qmlpreviewapplication.h qmlpreviewfilesystemwatcher.cpp qmlpreviewfilesystemwatcher.h - LIBRARIES - Qt::QmlDebugPrivate PUBLIC_LIBRARIES Qt::Network - Qt::QmlDebug + Qt::QmlDebugPrivate ) #### Keys ignored in scope 1:.:.:qmlpreview.pro:<TRUE>: diff --git a/tools/qmlprofiler/.prev_CMakeLists.txt b/tools/qmlprofiler/.prev_CMakeLists.txt index f182f00b01..eb51932918 100644 --- a/tools/qmlprofiler/.prev_CMakeLists.txt +++ b/tools/qmlprofiler/.prev_CMakeLists.txt @@ -12,11 +12,9 @@ qt_add_tool(qmlprofiler qmlprofilerapplication.cpp qmlprofilerapplication.h qmlprofilerclient.cpp qmlprofilerclient.h qmlprofilerdata.cpp qmlprofilerdata.h - LIBRARIES - Qt::QmlDebugPrivate PUBLIC_LIBRARIES Qt::Network - Qt::QmlDebug + Qt::QmlDebugPrivate ) #### Keys ignored in scope 1:.:.:qmlprofiler.pro:<TRUE>: diff --git a/tools/qmlprofiler/CMakeLists.txt b/tools/qmlprofiler/CMakeLists.txt index 6ff683926b..6bc6fff823 100644 --- a/tools/qmlprofiler/CMakeLists.txt +++ b/tools/qmlprofiler/CMakeLists.txt @@ -13,11 +13,9 @@ qt_add_tool(qmlprofiler qmlprofilerapplication.cpp qmlprofilerapplication.h qmlprofilerclient.cpp qmlprofilerclient.h qmlprofilerdata.cpp qmlprofilerdata.h - LIBRARIES - Qt::QmlDebugPrivate PUBLIC_LIBRARIES Qt::Network - Qt::QmlDebug + Qt::QmlDebugPrivate ) #### Keys ignored in scope 1:.:.:qmlprofiler.pro:<TRUE>: diff --git a/tools/qmlscene/.prev_CMakeLists.txt b/tools/qmlscene/.prev_CMakeLists.txt index c56301e359..df4bfeaf44 100644 --- a/tools/qmlscene/.prev_CMakeLists.txt +++ b/tools/qmlscene/.prev_CMakeLists.txt @@ -9,14 +9,13 @@ qt_add_tool(qmlscene main.cpp DEFINES QML_RUNTIME_TESTING - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Qml Qt::Quick + Qt::QuickPrivate ) #### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>: diff --git a/tools/qmlscene/CMakeLists.txt b/tools/qmlscene/CMakeLists.txt index 4212c627d4..b53816c494 100644 --- a/tools/qmlscene/CMakeLists.txt +++ b/tools/qmlscene/CMakeLists.txt @@ -10,14 +10,13 @@ qt_add_tool(qmlscene main.cpp DEFINES QML_RUNTIME_TESTING - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Qml Qt::Quick + Qt::QuickPrivate ) #### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>: diff --git a/tools/qmltime/CMakeLists.txt b/tools/qmltime/CMakeLists.txt index 4fb203cfbe..03425e9ecf 100644 --- a/tools/qmltime/CMakeLists.txt +++ b/tools/qmltime/CMakeLists.txt @@ -7,18 +7,27 @@ qt_add_executable(qmltime GUI SOURCES - qmltime.cpp - LIBRARIES - Qt::QuickPrivate + qmltime.cpp qmltime.h PUBLIC_LIBRARIES Qt::Gui Qt::Qml Qt::Quick + Qt::QuickPrivate ) #### Keys ignored in scope 1:.:.:qmltime.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "Time" +# QML_IMPORT_NAME = "QmlTime" +# QML_IMPORT_VERSION = "1.0" # TEMPLATE = "app" ## Scopes: ##################################################################### + +set_target_properties(qmltime PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 1.0 + QT_QML_MODULE_URI QmlTime +) + +qt6_qml_type_registration(qmltime) |