diff options
48 files changed, 175 insertions, 212 deletions
diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/CMakeLists.txt index 41abb2891b..48841ac16c 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/CMakeLists.txt @@ -24,7 +24,7 @@ qt6_add_qml_module(chartsplugin ) target_sources(chartsplugin PRIVATE - chartsplugin.cpp chartsplugin.h + chartsplugin.h piechart.cpp piechart.h pieslice.cpp pieslice.h ) diff --git a/examples/quick/scenegraph/.prev_CMakeLists.txt b/examples/quick/scenegraph/.prev_CMakeLists.txt index f4e416390a..040945b9e8 100644 --- a/examples/quick/scenegraph/.prev_CMakeLists.txt +++ b/examples/quick/scenegraph/.prev_CMakeLists.txt @@ -12,7 +12,7 @@ if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3) add_subdirectory(textureinthread) add_subdirectory(twotextureproviders) endif() -if(APPLE_OSX) +if(APPLE_IOS OR APPLE_OSX) add_subdirectory(metalunderqml) add_subdirectory(metaltextureimport) endif() @@ -21,4 +21,5 @@ if(WIN32) endif() if(QT_FEATURE_vulkan) add_subdirectory(vulkanunderqml) + add_subdirectory(vulkantextureimport) endif() diff --git a/examples/quick/scenegraph/fboitem/CMakeLists.txt b/examples/quick/scenegraph/fboitem/CMakeLists.txt index e788fe5468..3f49453d0d 100644 --- a/examples/quick/scenegraph/fboitem/CMakeLists.txt +++ b/examples/quick/scenegraph/fboitem/CMakeLists.txt @@ -36,6 +36,8 @@ target_link_libraries(fboitem PUBLIC # Resources: set(fboitem_resource_files "main.qml" + "shaders/+qsb/checker.frag" + "shaders/checker.frag" ) qt6_add_resources(fboitem "fboitem" diff --git a/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt b/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt index 82e5fc71c1..08a527f4b8 100644 --- a/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt +++ b/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt @@ -21,7 +21,6 @@ add_qt_gui_executable(metaltextureimport metaltextureimport.h metaltextureimport.mm ) target_link_libraries(metaltextureimport PUBLIC - "-framework AppKit" "-framework Metal" Qt::Core Qt::Gui @@ -44,6 +43,12 @@ qt6_add_resources(metaltextureimport "metaltextureimport" ${metaltextureimport_resource_files} ) +if(APPLE_OSX) + target_link_libraries(metaltextureimport PUBLIC + "-framework AppKit" + ) +endif() + install(TARGETS metaltextureimport RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/scenegraph/metalunderqml/CMakeLists.txt b/examples/quick/scenegraph/metalunderqml/CMakeLists.txt index 6f61cdd727..60bb00aa37 100644 --- a/examples/quick/scenegraph/metalunderqml/CMakeLists.txt +++ b/examples/quick/scenegraph/metalunderqml/CMakeLists.txt @@ -21,7 +21,6 @@ add_qt_gui_executable(metalunderqml metalsquircle.h metalsquircle.mm ) target_link_libraries(metalunderqml PUBLIC - "-framework AppKit" "-framework Metal" Qt::Core Qt::Gui @@ -44,6 +43,12 @@ qt6_add_resources(metalunderqml "metalunderqml" ${metalunderqml_resource_files} ) +if(APPLE_OSX) + target_link_libraries(metalunderqml PUBLIC + "-framework AppKit" + ) +endif() + install(TARGETS metalunderqml RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/scenegraph/rendernode/CMakeLists.txt b/examples/quick/scenegraph/rendernode/CMakeLists.txt index 51de91a37e..458dc251e8 100644 --- a/examples/quick/scenegraph/rendernode/CMakeLists.txt +++ b/examples/quick/scenegraph/rendernode/CMakeLists.txt @@ -35,8 +35,6 @@ set(rendernode_resource_files "main.qml" "metalshader.frag" "metalshader.vert" - "shader_frag.cso" - "shader_vert.cso" ) qt6_add_resources(rendernode "rendernode" @@ -46,16 +44,6 @@ qt6_add_resources(rendernode "rendernode" ${rendernode_resource_files} ) -if(QT_FEATURE_d3d12) - target_sources(rendernode PUBLIC - d3d12renderer.cpp d3d12renderer.h - ) - - target_link_libraries(rendernode PUBLIC - d3d12 - ) -endif() - if(APPLE_OSX) target_sources(rendernode PUBLIC metalrenderer.h metalrenderer.mm diff --git a/examples/quick/scenegraph/simplematerial/CMakeLists.txt b/examples/quick/scenegraph/simplematerial/CMakeLists.txt index 9fb02cb53b..6c385f4983 100644 --- a/examples/quick/scenegraph/simplematerial/CMakeLists.txt +++ b/examples/quick/scenegraph/simplematerial/CMakeLists.txt @@ -17,6 +17,7 @@ find_package(Qt6 COMPONENTS Quick) add_qt_gui_executable(simplematerial simplematerial.cpp + simplematerialitem.cpp simplematerialitem.h ) target_link_libraries(simplematerial PUBLIC Qt::Core diff --git a/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt b/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt index adcc3b8978..f9f9ec6bab 100644 --- a/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt +++ b/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt @@ -31,6 +31,12 @@ target_link_libraries(twotextureproviders PUBLIC # Resources: set(twotextureproviders_resource_files "main.qml" + "shaders/+qsb/checker.frag" + "shaders/+qsb/xorblender.frag" + "shaders/+qsb/xorblender.vert" + "shaders/checker.frag" + "shaders/xorblender.frag" + "shaders/xorblender.vert" ) qt6_add_resources(twotextureproviders "twotextureproviders" diff --git a/examples/quick/shadereffects/CMakeLists.txt b/examples/quick/shadereffects/CMakeLists.txt index 972ef27dc8..039baf31b7 100644 --- a/examples/quick/shadereffects/CMakeLists.txt +++ b/examples/quick/shadereffects/CMakeLists.txt @@ -32,12 +32,6 @@ set(shadereffects_resource_files "content/Slider.qml" "content/face-smile.png" "content/qt-logo.png" - "content/shaders/+hlsl/blur.frag" - "content/shaders/+hlsl/colorize.frag" - "content/shaders/+hlsl/genie.vert" - "content/shaders/+hlsl/outline.frag" - "content/shaders/+hlsl/shadow.frag" - "content/shaders/+hlsl/wobble.frag" "content/shaders/+qsb/blur.frag" "content/shaders/+qsb/colorize.frag" "content/shaders/+qsb/genie.vert" diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt index e7c0ae5f91..849c317ece 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.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "2.15" CLASSNAME QmlFolderListModelPlugin SKIP_TYPE_REGISTRATION SOURCES @@ -24,5 +24,5 @@ qt_add_qml_module(qmlfolderlistmodelplugin #### Keys ignored in scope 1:.:.:folderlistmodel.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "2.15" # TARGETPATH = "Qt/labs/folderlistmodel" diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt index b7dabd13c9..a3a6f83463 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.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "1.15" DESIGNER_SUPPORTED CLASSNAME QtQuickLayoutsPlugin SKIP_TYPE_REGISTRATION @@ -31,5 +31,5 @@ qt_add_qml_module(qquicklayoutsplugin #### Keys ignored in scope 1:.:.:layouts.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "1.15" # TARGETPATH = "QtQuick/Layouts" diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt index efbf67e726..3e711d67d3 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.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "2.15" CLASSNAME QQmlLocalStoragePlugin SKIP_TYPE_REGISTRATION SOURCES @@ -23,6 +23,6 @@ qt_add_qml_module(qmllocalstorageplugin #### Keys ignored in scope 1:.:.:localstorage.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "2.15" # OTHER_FILES = "localstorage.json" # TARGETPATH = "QtQuick/LocalStorage" diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt index dc4639725d..8594c08408 100644 --- a/src/imports/models/CMakeLists.txt +++ b/src/imports/models/CMakeLists.txt @@ -7,7 +7,7 @@ qt_add_qml_module(modelsplugin TARGET_PATH "QtQml/Models.2" URI "QtQml.Models" - VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "2.15" DESIGNER_SUPPORTED CLASSNAME QtQmlModelsPlugin SKIP_TYPE_REGISTRATION @@ -23,5 +23,5 @@ qt_add_qml_module(modelsplugin #### Keys ignored in scope 1:.:.:models.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "2.15" # TARGETPATH = "QtQml/Models.2" diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt index 5117471776..482fe56c52 100644 --- a/src/imports/particles/CMakeLists.txt +++ b/src/imports/particles/CMakeLists.txt @@ -7,7 +7,7 @@ qt_add_qml_module(particlesplugin TARGET_PATH "QtQuick/Particles.2" URI "QtQuick.Particles" - VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "2.15" CLASSNAME QtQuick2ParticlesPlugin SKIP_TYPE_REGISTRATION SOURCES @@ -26,5 +26,5 @@ qt_add_qml_module(particlesplugin #### Keys ignored in scope 1:.:.:particles.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "2.15" # TARGETPATH = "QtQuick/Particles.2" diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt index 3f920616f5..de771ce3d2 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.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "2.15" DESIGNER_SUPPORTED CLASSNAME QtQmlPlugin SKIP_TYPE_REGISTRATION @@ -34,7 +34,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.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "2.15" # TARGETPATH = "QtQml" ## Scopes: diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt index cabf9f1055..925f39e8b5 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.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "2.15" DESIGNER_SUPPORTED CLASSNAME QtQmlPlugin SKIP_TYPE_REGISTRATION @@ -35,7 +35,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.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "2.15" # TARGETPATH = "QtQml" ## Scopes: diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt index 8e10b2a40a..80b286091d 100644 --- a/src/imports/qtquick2/CMakeLists.txt +++ b/src/imports/qtquick2/CMakeLists.txt @@ -7,7 +7,7 @@ qt_add_qml_module(qtquick2plugin TARGET_PATH "QtQuick.2" URI "QtQuick" - VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "2.15" DESIGNER_SUPPORTED CLASSNAME QtQuick2Plugin SKIP_TYPE_REGISTRATION @@ -29,7 +29,7 @@ qt_add_qml_module(qtquick2plugin #### Keys ignored in scope 1:.:.:qtquick2.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "2.15" # TARGETPATH = "QtQuick.2" ## Scopes: diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt index 717e6af119..512b33ff73 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.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "1.15" CLASSNAME QmlShapesPlugin SKIP_TYPE_REGISTRATION SOURCES @@ -25,5 +25,5 @@ qt_add_qml_module(qmlshapesplugin #### Keys ignored in scope 1:.:.:shapes.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "1.15" # TARGETPATH = "QtQuick/Shapes" diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt index a6e53d2027..64bb6f8787 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.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "1.15" CLASSNAME QtQmlStateMachinePlugin SKIP_TYPE_REGISTRATION SOURCES @@ -28,5 +28,5 @@ qt_add_qml_module(qtqmlstatemachine #### Keys ignored in scope 1:.:.:statemachine.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "1.15" # TARGETPATH = "QtQml/StateMachine" diff --git a/src/imports/testlib/.prev_CMakeLists.txt b/src/imports/testlib/.prev_CMakeLists.txt index 6e54d1ffcc..d08507f597 100644 --- a/src/imports/testlib/.prev_CMakeLists.txt +++ b/src/imports/testlib/.prev_CMakeLists.txt @@ -6,14 +6,18 @@ qt_add_qml_module(qmltestplugin URI "QtTest" - VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "1.15" CLASSNAME QTestQmlModule DEPENDENCIES QtQuick.Window/2.0 SOURCES main.cpp + quicktestevent.cpp quicktestevent_p.h + quicktestresultforeign_p.h + quicktestutil.cpp quicktestutil_p.h LIBRARIES Qt::CorePrivate + Qt::GuiPrivate Qt::QmlPrivate Qt::QuickTestPrivate PUBLIC_LIBRARIES @@ -27,7 +31,7 @@ qt_add_qml_module(qmltestplugin #### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "1.15" # OTHER_FILES = "testlib.json" # QML_FILES = "TestCase.qml" "SignalSpy.qml" "testlogger.js" # TARGETPATH = "QtTest" diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt index eada3b6df6..37db859180 100644 --- a/src/imports/testlib/CMakeLists.txt +++ b/src/imports/testlib/CMakeLists.txt @@ -6,14 +6,18 @@ qt_add_qml_module(qmltestplugin URI "QtTest" - VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "1.15" CLASSNAME QTestQmlModule DEPENDENCIES QtQuick.Window/2.0 SOURCES main.cpp + quicktestevent.cpp quicktestevent_p.h + quicktestresultforeign_p.h + quicktestutil.cpp quicktestutil_p.h LIBRARIES Qt::CorePrivate + Qt::GuiPrivate Qt::QmlPrivate Qt::QuickTestPrivate PUBLIC_LIBRARIES @@ -27,7 +31,7 @@ qt_add_qml_module(qmltestplugin #### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "1.15" # OTHER_FILES = "testlib.json" # QML_FILES = "TestCase.qml" "SignalSpy.qml" "testlogger.js" # TARGETPATH = "QtTest" diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt index 2e708c854e..c80af8d4dd 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.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "1.15" CLASSNAME QmlWavefrontMeshPlugin SKIP_TYPE_REGISTRATION SOURCES @@ -24,5 +24,5 @@ qt_add_qml_module(qmlwavefrontmeshplugin #### Keys ignored in scope 1:.:.:wavefrontmesh.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "1.15" # TARGETPATH = "Qt/labs/wavefrontmesh" diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt index f4a65e9b3f..71e3d66fa5 100644 --- a/src/imports/window/CMakeLists.txt +++ b/src/imports/window/CMakeLists.txt @@ -7,7 +7,7 @@ qt_add_qml_module(windowplugin TARGET_PATH "QtQuick/Window.2" URI "QtQuick.Window" - VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "2.15" DESIGNER_SUPPORTED CLASSNAME QtQuick2WindowPlugin SKIP_TYPE_REGISTRATION @@ -25,5 +25,5 @@ qt_add_qml_module(windowplugin #### Keys ignored in scope 1:.:.:window.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "2.15" # TARGETPATH = "QtQuick/Window.2" diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt index b9948cf84e..8e82b70346 100644 --- a/src/imports/workerscript/CMakeLists.txt +++ b/src/imports/workerscript/CMakeLists.txt @@ -7,7 +7,7 @@ qt_add_qml_module(workerscriptplugin TARGET_PATH "QtQml/WorkerScript.2" URI "QtQml.WorkerScript" - VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "2.15" DESIGNER_SUPPORTED CLASSNAME QtQmlWorkerScriptPlugin SKIP_TYPE_REGISTRATION @@ -23,5 +23,5 @@ qt_add_qml_module(workerscriptplugin #### Keys ignored in scope 1:.:.:workerscript.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "2.15" # TARGETPATH = "QtQml/WorkerScript.2" diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt index 199c638cd9..799865e80f 100644 --- a/src/particles/CMakeLists.txt +++ b/src/particles/CMakeLists.txt @@ -98,7 +98,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.2" +# QML_IMPORT_NAME = "QtQuick.Particles" ## Scopes: ##################################################################### diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt index bda18dd619..8dc29199a9 100644 --- a/src/plugins/scenegraph/openvg/CMakeLists.txt +++ b/src/plugins/scenegraph/openvg/CMakeLists.txt @@ -47,6 +47,21 @@ qt_add_plugin(qsgopenvgbackend ## Scopes: ##################################################################### +qt_extend_target(qsgopenvgbackend CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND debug_and_release + INCLUDE_DIRECTORIES + ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen/debug +) + +qt_extend_target(qsgopenvgbackend CONDITION debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug + INCLUDE_DIRECTORIES + ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen/release +) + +qt_extend_target(qsgopenvgbackend CONDITION NOT debug_and_release + INCLUDE_DIRECTORIES + ${CMAKE_CURRENT_BINARY_DIR}/../../../quick/.tracegen +) + qt_extend_target(qsgopenvgbackend CONDITION QT_FEATURE_quick_sprite SOURCES qsgopenvgspritenode.cpp qsgopenvgspritenode.h diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index 21119f1827..16f8cd9058 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -7,21 +7,6 @@ qt_add_module(Qml PLUGIN_TYPES qmltooling SOURCES - ../3rdparty/llvm/include/llvm-c/DataTypes.h - ../3rdparty/llvm/include/llvm/ADT/PointerIntPair.h - ../3rdparty/llvm/include/llvm/ADT/ilist.h - ../3rdparty/llvm/include/llvm/ADT/ilist_base.h - ../3rdparty/llvm/include/llvm/ADT/ilist_iterator.h - ../3rdparty/llvm/include/llvm/ADT/ilist_node.h - ../3rdparty/llvm/include/llvm/ADT/ilist_node_base.h - ../3rdparty/llvm/include/llvm/ADT/ilist_node_options.h - ../3rdparty/llvm/include/llvm/ADT/iterator.h - ../3rdparty/llvm/include/llvm/ADT/iterator_range.h - ../3rdparty/llvm/include/llvm/ADT/simple_ilist.h - ../3rdparty/llvm/include/llvm/Demangle/Compiler.h - ../3rdparty/llvm/include/llvm/Support/Compiler.h - ../3rdparty/llvm/include/llvm/Support/DataTypes.h - ../3rdparty/llvm/include/llvm/Support/PointerLikeTypeTraits.h ../3rdparty/masm/assembler/*.h ../3rdparty/masm/assembler/ARMv7Assembler.cpp ../3rdparty/masm/assembler/LinkBuffer.cpp @@ -306,7 +291,6 @@ qt_add_module(Qml ${CMAKE_CURRENT_BINARY_DIR}/jsruntime ${CMAKE_CURRENT_BINARY_DIR}/memory ${CMAKE_CURRENT_BINARY_DIR}/qmldirparser - ../3rdparty/llvm/include ../3rdparty/masm ../3rdparty/masm/assembler ../3rdparty/masm/disassembler @@ -336,6 +320,12 @@ 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" + ## Scopes: ##################################################################### diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index de6b0623f1..1ac929ccea 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -7,21 +7,6 @@ qt_add_module(Qml PLUGIN_TYPES qmltooling SOURCES - ../3rdparty/llvm/include/llvm-c/DataTypes.h - ../3rdparty/llvm/include/llvm/ADT/PointerIntPair.h - ../3rdparty/llvm/include/llvm/ADT/ilist.h - ../3rdparty/llvm/include/llvm/ADT/ilist_base.h - ../3rdparty/llvm/include/llvm/ADT/ilist_iterator.h - ../3rdparty/llvm/include/llvm/ADT/ilist_node.h - ../3rdparty/llvm/include/llvm/ADT/ilist_node_base.h - ../3rdparty/llvm/include/llvm/ADT/ilist_node_options.h - ../3rdparty/llvm/include/llvm/ADT/iterator.h - ../3rdparty/llvm/include/llvm/ADT/iterator_range.h - ../3rdparty/llvm/include/llvm/ADT/simple_ilist.h - ../3rdparty/llvm/include/llvm/Demangle/Compiler.h - ../3rdparty/llvm/include/llvm/Support/Compiler.h - ../3rdparty/llvm/include/llvm/Support/DataTypes.h - ../3rdparty/llvm/include/llvm/Support/PointerLikeTypeTraits.h # ../3rdparty/masm/assembler/*.h special case remove ../3rdparty/masm/assembler/ARMv7Assembler.cpp ../3rdparty/masm/assembler/LinkBuffer.cpp @@ -306,7 +291,6 @@ qt_add_module(Qml ${CMAKE_CURRENT_BINARY_DIR}/jsruntime ${CMAKE_CURRENT_BINARY_DIR}/memory ${CMAKE_CURRENT_BINARY_DIR}/qmldirparser - ../3rdparty/llvm/include ../3rdparty/masm ../3rdparty/masm/assembler ../3rdparty/masm/disassembler @@ -343,6 +327,12 @@ qt_process_qlalr(Qml "${CMAKE_CURRENT_SOURCE_DIR}/parser/qqmljs.g" "${_qt_qlalr_ 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" + ## Scopes: ##################################################################### diff --git a/src/qml/configure.cmake b/src/qml/configure.cmake index 067eb52218..7a337b2714 100644 --- a/src/qml/configure.cmake +++ b/src/qml/configure.cmake @@ -117,71 +117,71 @@ qt_feature("cxx14_make_unique" PRIVATE LABEL "C++14 make_unique" CONDITION QT_FEATURE_cxx14 OR TEST_cxx14_make_unique ) -qt_feature("qml_network" PUBLIC +qt_feature("qml-network" PUBLIC SECTION "QML" LABEL "QML network support" PURPOSE "Provides network transparency." CONDITION QT_FEATURE_network ) # On arm and arm64 we need a specialization of cacheFlush() for each OS to be enabeled. Therefore the config white list. Also Mind that e.g. x86_32 has arch.x86_64 but 32bit pointers. Therefore the checks for architecture and pointer size. Finally, ios and tvos can technically use the JIT but Apple does not allow it. Therefore, it's disabled by default. -qt_feature("qml_jit" PRIVATE +qt_feature("qml-jit" PRIVATE SECTION "QML" LABEL "QML just-in-time compiler" PURPOSE "Provides a JIT for QML and JavaScript" AUTODETECT NOT APPLE_IOS AND NOT APPLE_TVOS CONDITION ( ( ( TEST_architecture_arch STREQUAL i386 ) AND TEST_pointer_32bit AND QT_FEATURE_sse2 ) OR ( ( TEST_architecture_arch STREQUAL x86_64 ) AND TEST_pointer_64bit AND QT_FEATURE_sse2 ) OR ( ( TEST_architecture_arch STREQUAL arm ) AND TEST_pointer_32bit AND TEST_arm_fp AND TEST_arm_thumb AND ( LINUX OR APPLE_IOS OR APPLE_TVOS OR QNX ) ) OR ( ( TEST_architecture_arch STREQUAL arm64 ) AND TEST_pointer_64bit AND TEST_arm_fp AND ( LINUX OR APPLE_IOS OR APPLE_TVOS OR QNX OR INTEGRITY ) ) ) ) -qt_feature("qml_debug" PUBLIC +qt_feature("qml-debug" PUBLIC SECTION "QML" LABEL "QML debugging and profiling support" PURPOSE "Provides infrastructure and plugins for debugging and profiling." ) -qt_feature("qml_profiler" PRIVATE +qt_feature("qml-profiler" PRIVATE SECTION "QML" LABEL "Command line QML Profiler" PURPOSE "Supports retrieving QML tracing data from an application." CONDITION ( QT_FEATURE_commandlineparser ) AND ( QT_FEATURE_qml_debug ) AND ( QT_FEATURE_qml_network AND QT_FEATURE_localserver ) AND ( QT_FEATURE_xmlstreamwriter ) ) -qt_feature("qml_preview" PRIVATE +qt_feature("qml-preview" PRIVATE SECTION "QML" LABEL "Command line QML Preview tool" PURPOSE "Updates QML documents in your application live as you change them on disk" CONDITION ( QT_FEATURE_commandlineparser ) AND ( QT_FEATURE_filesystemwatcher ) AND ( QT_FEATURE_qml_network AND QT_FEATURE_localserver ) AND ( QT_FEATURE_process ) AND ( QT_FEATURE_qml_debug ) ) -qt_feature("qml_devtools" PRIVATE +qt_feature("qml-devtools" PRIVATE SECTION "QML" LABEL "QML Development Tools" PURPOSE "Provides the QmlDevtools library and various utilities." ) -qt_feature("qml_sequence_object" PRIVATE +qt_feature("qml-sequence-object" PRIVATE SECTION "QML" LABEL "QML sequence object" PURPOSE "Supports mapping sequence types into QML." ) -qt_feature("qml_xml_http_request" PRIVATE +qt_feature("qml-xml-http-request" PRIVATE SECTION "QML" LABEL "QML XML http request" PURPOSE "Provides support for sending XML http requests." CONDITION ( QT_FEATURE_xmlstreamreader ) AND ( QT_FEATURE_qml_network ) ) -qt_feature("qml_locale" PRIVATE +qt_feature("qml-locale" PRIVATE SECTION "QML" LABEL "QML Locale" PURPOSE "Provides support for locales in QML." ) -qt_feature("qml_animation" PRIVATE +qt_feature("qml-animation" PRIVATE SECTION "QML" LABEL "QML Animations" PURPOSE "Provides support for animations and timers in QML." CONDITION QT_FEATURE_animation ) -qt_feature("qml_worker_script" PRIVATE +qt_feature("qml-worker-script" PRIVATE SECTION "QML" LABEL "QML WorkerScript" PURPOSE "Enables the use of threads in QML." CONDITION QT_FEATURE_thread ) -qt_feature("qml_itemmodel" PRIVATE +qt_feature("qml-itemmodel" PRIVATE SECTION "QML" LABEL "QML Item Model" PURPOSE "Provides the item model for item views in QML" diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt index f0896e49fd..5bf34062d3 100644 --- a/src/qmlmodels/CMakeLists.txt +++ b/src/qmlmodels/CMakeLists.txt @@ -7,7 +7,7 @@ qt_add_module(QmlModels SOURCES qqmlchangeset.cpp qqmlchangeset_p.h - qqmlmodelsmodule.cpp qqmlmodelsmodule_p.h + qqmlmodelsmodule_p.h qtqmlmodelsglobal.h qtqmlmodelsglobal_p.h DEFINES QT_NO_FOREACH @@ -21,6 +21,12 @@ qt_add_module(QmlModels Qt::Qml ) +#### Keys ignored in scope 1:.:.:qmlmodels.pro:<TRUE>: +# IMPORT_VERSION = "2.15" +# QMLTYPES_FILENAME = "plugins.qmltypes" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/Models.2" +# QML_IMPORT_NAME = "QtQml.Models" + ## Scopes: ##################################################################### diff --git a/src/qmlmodels/configure.cmake b/src/qmlmodels/configure.cmake index b1242a2aa1..44643c88a6 100644 --- a/src/qmlmodels/configure.cmake +++ b/src/qmlmodels/configure.cmake @@ -14,24 +14,24 @@ #### Features -qt_feature("qml_object_model" PRIVATE +qt_feature("qml-object-model" PRIVATE SECTION "QML" LABEL "QML object model" PURPOSE "Provides the ObjectModel and Instantiator QML types." ) -qt_feature("qml_list_model" PRIVATE +qt_feature("qml-list-model" PRIVATE SECTION "QML" LABEL "QML list model" PURPOSE "Provides the ListModel QML type." CONDITION QT_FEATURE_qml_itemmodel ) -qt_feature("qml_delegate_model" PRIVATE +qt_feature("qml-delegate-model" PRIVATE SECTION "QML" LABEL "QML delegate model" PURPOSE "Provides the DelegateModel QML type." CONDITION QT_FEATURE_qml_object_model AND QT_FEATURE_qml_itemmodel ) -qt_feature("qml_table_model" PRIVATE +qt_feature("qml-table-model" PRIVATE SECTION "QML" LABEL "QML table model" PURPOSE "Provides the TableModel QML type." diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt index ee1b7d39ab..288a5190a5 100644 --- a/src/qmltest/.prev_CMakeLists.txt +++ b/src/qmltest/.prev_CMakeLists.txt @@ -5,21 +5,19 @@ ##################################################################### qt_add_module(QuickTest + GENERATE_METATYPES QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG} SOURCES qtestoptions_p.h quicktest.cpp quicktest.h - quicktestevent.cpp quicktestevent_p.h quicktestglobal.h quicktestresult.cpp quicktestresult_p.h - quicktestutil.cpp quicktestutil_p.h DEFINES QT_NO_FOREACH QT_NO_URL_CAST_FROM_STRING LIBRARIES Qt::CorePrivate Qt::Gui - Qt::GuiPrivate Qt::QmlPrivate Qt::Quick Qt::QuickPrivate diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt index 4760481e35..269e176394 100644 --- a/src/qmltest/CMakeLists.txt +++ b/src/qmltest/CMakeLists.txt @@ -5,14 +5,13 @@ ##################################################################### qt_add_module(QuickTest + GENERATE_METATYPES QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG} SOURCES qtestoptions_p.h quicktest.cpp quicktest.h - quicktestevent.cpp quicktestevent_p.h quicktestglobal.h quicktestresult.cpp quicktestresult_p.h - quicktestutil.cpp quicktestutil_p.h DEFINES QT_NO_FOREACH QT_NO_URL_CAST_FROM_STRING @@ -20,7 +19,6 @@ qt_add_module(QuickTest LIBRARIES Qt::CorePrivate Qt::Gui - Qt::GuiPrivate Qt::QmlPrivate Qt::Quick Qt::QuickPrivate diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt index 215231b5b8..f9cf2dbd5f 100644 --- a/src/qmlworkerscript/.prev_CMakeLists.txt +++ b/src/qmlworkerscript/.prev_CMakeLists.txt @@ -6,7 +6,6 @@ qt_add_module(QmlWorkerScript SOURCES - qqmlworkerscriptmodule.cpp qqmlworkerscriptmodule_p.h qquickworkerscript.cpp qquickworkerscript_p.h qtqmlworkerscriptglobal.h qtqmlworkerscriptglobal_p.h qv4serialize.cpp qv4serialize_p.h @@ -45,6 +44,12 @@ qt_add_module(QmlWorkerScript Qt::Qml ) +#### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: +# IMPORT_VERSION = "2.15" +# QMLTYPES_FILENAME = "plugins.qmltypes" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript.2" +# QML_IMPORT_NAME = "QtQml.WorkerScript" + ## Scopes: ##################################################################### diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index 297e0404d9..1f61555bd1 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -6,7 +6,6 @@ qt_add_module(QmlWorkerScript SOURCES - qqmlworkerscriptmodule.cpp qqmlworkerscriptmodule_p.h qquickworkerscript.cpp qquickworkerscript_p.h qtqmlworkerscriptglobal.h qtqmlworkerscriptglobal_p.h qv4serialize.cpp qv4serialize_p.h @@ -45,6 +44,12 @@ qt_add_module(QmlWorkerScript Qt::Qml ) +#### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: +# IMPORT_VERSION = "2.15" +# QMLTYPES_FILENAME = "plugins.qmltypes" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript.2" +# QML_IMPORT_NAME = "QtQml.WorkerScript" + ## Scopes: ##################################################################### diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 772848eb11..eafd135207 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -124,7 +124,6 @@ qt_add_module(Quick scenegraph/util/qsgninepatchnode.cpp scenegraph/util/qsgninepatchnode.h scenegraph/util/qsgplaintexture.cpp scenegraph/util/qsgplaintexture_p.h scenegraph/util/qsgrectanglenode.cpp scenegraph/util/qsgrectanglenode.h - scenegraph/util/qsgrhinativetextureimporter.cpp scenegraph/util/qsgrhinativetextureimporter_p.h scenegraph/util/qsgsimplematerial.cpp scenegraph/util/qsgsimplematerial.h scenegraph/util/qsgsimplerectnode.cpp scenegraph/util/qsgsimplerectnode.h scenegraph/util/qsgsimpletexturenode.cpp scenegraph/util/qsgsimpletexturenode.h @@ -165,7 +164,6 @@ qt_add_module(Quick util/qquicktransition.cpp util/qquicktransition_p.h util/qquicktransitionmanager.cpp util/qquicktransitionmanager_p_p.h - util/qquickutilmodule.cpp util/qquickutilmodule_p.h util/qquickvalidator.cpp util/qquickvalidator_p.h util/qquickvaluetypes.cpp util/qquickvaluetypes_p.h DEFINES @@ -348,6 +346,12 @@ if(ANDROID) ) endif() +#### Keys ignored in scope 1:.:.:quick.pro:<TRUE>: +# IMPORT_VERSION = "2.15" +# QMLTYPES_FILENAME = "plugins.qmltypes" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick.2" +# QML_IMPORT_NAME = "QtQuick" + ## Scopes: ##################################################################### @@ -581,6 +585,9 @@ qt_extend_target(Quick CONDITION QT_FEATURE_wheelevent handlers/qquickwheelhandler.cpp handlers/qquickwheelhandler_p.h handlers/qquickwheelhandler_p_p.h ) + + +qt_create_tracepoints(Quick qtquick.tracepoints) qt_add_docs(Quick doc/qtquick.qdocconf ) diff --git a/src/quick/configure.cmake b/src/quick/configure.cmake index 26213be687..1685ca63ef 100644 --- a/src/quick/configure.cmake +++ b/src/quick/configure.cmake @@ -11,109 +11,97 @@ #### Tests -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../config.tests/d3d12/CMakeLists.txt") - qt_config_compile_test("d3d12" - LABEL "Direct3D 12" - PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../config.tests/d3d12") -endif() - #### Features -qt_feature("d3d12" PUBLIC - SECTION "Qt Quick" - LABEL "Direct3D 12" - PURPOSE "Provides a Direct3D 12 backend for the scenegraph." - CONDITION TEST_d3d12 -) -qt_feature("quick_animatedimage" PRIVATE +qt_feature("quick-animatedimage" PRIVATE SECTION "Qt Quick" LABEL "AnimatedImage item" PURPOSE "Provides the AnimatedImage item." CONDITION TARGET Qt::Gui AND QT_FEATURE_movie ) -qt_feature("quick_canvas" PRIVATE +qt_feature("quick-canvas" PRIVATE SECTION "Qt Quick" LABEL "Canvas item" PURPOSE "Provides the Canvas item." CONDITION QT_FEATURE_quick_path ) -qt_feature("quick_designer" PRIVATE +qt_feature("quick-designer" PRIVATE SECTION "Qt Quick" LABEL "Support for Qt Quick Designer" PURPOSE "Provides support for the Qt Quick Designer in Qt Creator." ) -qt_feature("quick_flipable" PRIVATE +qt_feature("quick-flipable" PRIVATE SECTION "Qt Quick" LABEL "Flipable item" PURPOSE "Provides the Flipable item." ) -qt_feature("quick_gridview" PRIVATE +qt_feature("quick-gridview" PRIVATE SECTION "Qt Quick" LABEL "GridView item" PURPOSE "Provides the GridView item." CONDITION QT_FEATURE_qml_delegate_model ) -qt_feature("quick_itemview" PRIVATE +qt_feature("quick-itemview" PRIVATE LABEL "ItemView item" CONDITION QT_FEATURE_quick_gridview OR QT_FEATURE_quick_listview OR QT_FEATURE_quick_tableview ) -qt_feature("quick_viewtransitions" PRIVATE +qt_feature("quick-viewtransitions" PRIVATE LABEL "Transitions required for ItemViews and Positioners" CONDITION QT_FEATURE_quick_itemview OR QT_FEATURE_quick_positioners ) -qt_feature("quick_listview" PRIVATE +qt_feature("quick-listview" PRIVATE SECTION "Qt Quick" LABEL "ListView item" PURPOSE "Provides the ListView item." CONDITION QT_FEATURE_qml_delegate_model ) -qt_feature("quick_tableview" PRIVATE +qt_feature("quick-tableview" PRIVATE SECTION "Qt Quick" LABEL "TableView item" PURPOSE "Provides the TableView item." CONDITION QT_FEATURE_qml_table_model ) -qt_feature("quick_particles" PRIVATE +qt_feature("quick-particles" PRIVATE SECTION "Qt Quick" LABEL "Particle support" PURPOSE "Provides a particle system." CONDITION TARGET Qt::Gui AND QT_FEATURE_quick_shadereffect AND QT_FEATURE_quick_sprite AND QT_FEATURE_opengl ) -qt_feature("quick_path" PRIVATE +qt_feature("quick-path" PRIVATE SECTION "Qt Quick" LABEL "Path support" PURPOSE "Provides Path elements." CONDITION QT_FEATURE_quick_shadereffect ) -qt_feature("quick_pathview" PRIVATE +qt_feature("quick-pathview" PRIVATE SECTION "Qt Quick" LABEL "PathView item" PURPOSE "Provides the PathView item." CONDITION ( QT_FEATURE_qml_delegate_model ) AND ( QT_FEATURE_quick_path ) ) -qt_feature("quick_positioners" PRIVATE +qt_feature("quick-positioners" PRIVATE SECTION "Qt Quick" LABEL "Positioner items" PURPOSE "Provides Positioner items." ) -qt_feature("quick_repeater" PRIVATE +qt_feature("quick-repeater" PRIVATE SECTION "Qt Quick" LABEL "Repeater item" PURPOSE "Provides the Repeater item." CONDITION QT_FEATURE_qml_delegate_model ) -qt_feature("quick_shadereffect" PRIVATE +qt_feature("quick-shadereffect" PRIVATE SECTION "Qt Quick" LABEL "ShaderEffect item" PURPOSE "Provides Shader effects." ) -qt_feature("quick_sprite" PRIVATE +qt_feature("quick-sprite" PRIVATE SECTION "Qt Quick" LABEL "Sprite item" PURPOSE "Provides the Sprite item." ) -qt_feature("quick_draganddrop" PUBLIC +qt_feature("quick-draganddrop" PUBLIC SECTION "Qt Quick" LABEL "Drag & Drop" PURPOSE "Drag and drop support for Qt Quick" diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt index 0150c49161..b8ef075952 100644 --- a/src/quickshapes/CMakeLists.txt +++ b/src/quickshapes/CMakeLists.txt @@ -56,6 +56,12 @@ 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" + ## Scopes: ##################################################################### diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt index 3237749513..cccfe6105c 100644 --- a/tests/auto/qml/CMakeLists.txt +++ b/tests/auto/qml/CMakeLists.txt @@ -5,7 +5,6 @@ add_subdirectory(qjsvalueiterator) add_subdirectory(qjsonbinding) add_subdirectory(qqmlfile) add_subdirectory(qqmlfileselector) -add_subdirectory(qmlmin) add_subdirectory(qqmlcomponent) add_subdirectory(qqmlconsole) add_subdirectory(qqmlengine) diff --git a/tests/auto/qml/qmlmin/CMakeLists.txt b/tests/auto/qml/qmlmin/CMakeLists.txt deleted file mode 100644 index 3f68bd0a86..0000000000 --- a/tests/auto/qml/qmlmin/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -# Generated from qmlmin.pro. - -##################################################################### -## tst_qmlmin Test: -##################################################################### - -qt_add_test(tst_qmlmin - SOURCES - tst_qmlmin.cpp - DEFINES - SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml -) - -## Scopes: -##################################################################### - -qt_extend_target(tst_qmlmin CONDITION CMAKE_CROSSCOMPILING AND NOT boot2qt - DEFINES - QTEST_CROSS_COMPILED -) diff --git a/tests/auto/quick/qquicklistview/CMakeLists.txt b/tests/auto/quick/qquicklistview/CMakeLists.txt index c2083c4876..c8e102a54b 100644 --- a/tests/auto/quick/qquicklistview/CMakeLists.txt +++ b/tests/auto/quick/qquicklistview/CMakeLists.txt @@ -19,6 +19,7 @@ qt_add_test(tst_qquicklistview incrementalmodel.cpp incrementalmodel.h proxytestinnermodel.cpp proxytestinnermodel.h randomsortmodel.cpp randomsortmodel.h + reusemodel.h tst_qquicklistview.cpp DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index a0dc54ecd0..258a4a7569 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -3,7 +3,6 @@ if(QT_FEATURE_qml_devtools) add_subdirectory(qmllint) - add_subdirectory(qmlmin) add_subdirectory(qmlimportscanner) # 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. diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt index 9c65660ece..31d9a65396 100644 --- a/tools/qml/.prev_CMakeLists.txt +++ b/tools/qml/.prev_CMakeLists.txt @@ -33,7 +33,7 @@ qt_add_resource(qml "qml" #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: -# ICON = "resources/qml64.png" +# ICON = "resources/qml-64.png" # QMAKE_TARGET_DESCRIPTION = "QML" "Runtime" ## Scopes: diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt index 12cec77288..6727f51a92 100644 --- a/tools/qml/CMakeLists.txt +++ b/tools/qml/CMakeLists.txt @@ -44,7 +44,7 @@ qt_add_resource(qml "qml" #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: -# ICON = "resources/qml64.png" +# ICON = "resources/qml-64.png" # QMAKE_TARGET_DESCRIPTION = "QML" "Runtime" ## Scopes: diff --git a/tools/qmllint/.prev_CMakeLists.txt b/tools/qmllint/.prev_CMakeLists.txt index 4dcfce16e8..9c44abe33b 100644 --- a/tools/qmllint/.prev_CMakeLists.txt +++ b/tools/qmllint/.prev_CMakeLists.txt @@ -7,13 +7,15 @@ qt_add_tool(qmllint SOURCES componentversion.cpp componentversion.h - fakemetaobject.cpp fakemetaobject.h findunqualified.cpp findunqualified.h + importedmembersvisitor.cpp importedmembersvisitor.h main.cpp - qcoloroutput.cpp qcoloroutput_p.h - qmljstypedescriptionreader.cpp qmljstypedescriptionreader.h + metatypes.h + qcoloroutput.cpp qcoloroutput.h scopetree.cpp scopetree.h + typedescriptionreader.cpp typedescriptionreader.h LIBRARIES + Qt::CorePrivate Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES Qt::QmlDevTools diff --git a/tools/qmllint/CMakeLists.txt b/tools/qmllint/CMakeLists.txt index 80a5f11128..ef06ec4abb 100644 --- a/tools/qmllint/CMakeLists.txt +++ b/tools/qmllint/CMakeLists.txt @@ -8,13 +8,15 @@ qt_add_tool(qmllint TOOLS_TARGET Qml # special case SOURCES componentversion.cpp componentversion.h - fakemetaobject.cpp fakemetaobject.h findunqualified.cpp findunqualified.h + importedmembersvisitor.cpp importedmembersvisitor.h main.cpp - qcoloroutput.cpp qcoloroutput_p.h - qmljstypedescriptionreader.cpp qmljstypedescriptionreader.h + metatypes.h + qcoloroutput.cpp qcoloroutput.h scopetree.cpp scopetree.h + typedescriptionreader.cpp typedescriptionreader.h LIBRARIES + Qt::CorePrivate Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES Qt::QmlDevTools diff --git a/tools/qmlmin/.prev_CMakeLists.txt b/tools/qmlmin/.prev_CMakeLists.txt deleted file mode 100644 index 6e897137ba..0000000000 --- a/tools/qmlmin/.prev_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Generated from qmlmin.pro. - -##################################################################### -## qmlmin Tool: -##################################################################### - -qt_add_tool(qmlmin - SOURCES - main.cpp - LIBRARIES - Qt::QmlDevToolsPrivate - PUBLIC_LIBRARIES - Qt::QmlDevTools -) - -#### Keys ignored in scope 1:.:.:qmlmin.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "QML/JS" "Minifier" -# _OPTION = "host_build" diff --git a/tools/qmlmin/CMakeLists.txt b/tools/qmlmin/CMakeLists.txt deleted file mode 100644 index 51ea6b52b6..0000000000 --- a/tools/qmlmin/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# Generated from qmlmin.pro. - -##################################################################### -## qmlmin Tool: -##################################################################### - -qt_add_tool(qmlmin - TOOLS_TARGET Qml # special case - SOURCES - main.cpp - LIBRARIES - Qt::QmlDevToolsPrivate - PUBLIC_LIBRARIES - Qt::QmlDevTools -) - -#### Keys ignored in scope 1:.:.:qmlmin.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "QML/JS" "Minifier" -# _OPTION = "host_build" |