aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt4
-rw-r--r--examples/quick/shapes/CMakeLists.txt4
-rw-r--r--src/imports/models/CMakeLists.txt3
-rw-r--r--src/imports/particles/CMakeLists.txt3
-rw-r--r--src/imports/qtquick2/CMakeLists.txt3
-rw-r--r--src/imports/window/CMakeLists.txt3
-rw-r--r--src/imports/workerscript/CMakeLists.txt3
-rw-r--r--src/particles/CMakeLists.txt4
-rw-r--r--src/qml/.prev_CMakeLists.txt1
-rw-r--r--src/qml/CMakeLists.txt1
-rw-r--r--src/qmlmodels/CMakeLists.txt4
-rw-r--r--src/qmlworkerscript/.prev_CMakeLists.txt4
-rw-r--r--src/qmlworkerscript/CMakeLists.txt4
-rw-r--r--src/quick/CMakeLists.txt13
-rw-r--r--tests/auto/quick/CMakeLists.txt6
-rw-r--r--tests/auto/quick/nokeywords/CMakeLists.txt5
-rw-r--r--tests/benchmarks/qml/painting/CMakeLists.txt3
17 files changed, 40 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83cea1d4c5..e0f120aa5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ project(QtDeclarative
LANGUAGES CXX C
)
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui Widgets Network
- OPTIONAL_COMPONENTS Sql Concurrent Test)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui Widgets Network OpenGL # special case
+ OPTIONAL_COMPONENTS Sql Concurrent Test) # special case
# export QT6_ADD_QML_MODULE to this project
include(src/qml/Qt6QmlMacros.cmake)
diff --git a/examples/quick/shapes/CMakeLists.txt b/examples/quick/shapes/CMakeLists.txt
index 6357140357..5428f96710 100644
--- a/examples/quick/shapes/CMakeLists.txt
+++ b/examples/quick/shapes/CMakeLists.txt
@@ -73,6 +73,9 @@ set_source_files_properties("content/item15.qml"
set_source_files_properties("content/item17.qml"
PROPERTIES QT_RESOURCE_ALIAS "item17.qml"
)
+set_source_files_properties("content/item18.qml"
+ PROPERTIES QT_RESOURCE_ALIAS "item18.qml"
+)
set_source_files_properties("content/item2.qml"
PROPERTIES QT_RESOURCE_ALIAS "item2.qml"
)
@@ -128,6 +131,7 @@ set(shapes_resource_files
"content/item14.qml"
"content/item15.qml"
"content/item17.qml"
+ "content/item18.qml"
"content/item2.qml"
"content/item3.qml"
"content/item4.qml"
diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt
index 8594c08408..90abdaa743 100644
--- a/src/imports/models/CMakeLists.txt
+++ b/src/imports/models/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
qt_add_qml_module(modelsplugin
- TARGET_PATH "QtQml/Models.2"
URI "QtQml.Models"
VERSION "2.15"
DESIGNER_SUPPORTED
@@ -24,4 +23,4 @@ qt_add_qml_module(modelsplugin
#### Keys ignored in scope 1:.:.:models.pro:<TRUE>:
# CXX_MODULE = "qml"
# IMPORT_VERSION = "2.15"
-# TARGETPATH = "QtQml/Models.2"
+# TARGETPATH = "QtQml/Models"
diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt
index 482fe56c52..d20d5eecba 100644
--- a/src/imports/particles/CMakeLists.txt
+++ b/src/imports/particles/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
qt_add_qml_module(particlesplugin
- TARGET_PATH "QtQuick/Particles.2"
URI "QtQuick.Particles"
VERSION "2.15"
CLASSNAME QtQuick2ParticlesPlugin
@@ -27,4 +26,4 @@ qt_add_qml_module(particlesplugin
#### Keys ignored in scope 1:.:.:particles.pro:<TRUE>:
# CXX_MODULE = "qml"
# IMPORT_VERSION = "2.15"
-# TARGETPATH = "QtQuick/Particles.2"
+# TARGETPATH = "QtQuick/Particles"
diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt
index 80b286091d..2973edb02f 100644
--- a/src/imports/qtquick2/CMakeLists.txt
+++ b/src/imports/qtquick2/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
qt_add_qml_module(qtquick2plugin
- TARGET_PATH "QtQuick.2"
URI "QtQuick"
VERSION "2.15"
DESIGNER_SUPPORTED
@@ -30,7 +29,7 @@ qt_add_qml_module(qtquick2plugin
#### Keys ignored in scope 1:.:.:qtquick2.pro:<TRUE>:
# CXX_MODULE = "qml"
# IMPORT_VERSION = "2.15"
-# TARGETPATH = "QtQuick.2"
+# TARGETPATH = "QtQuick"
## Scopes:
#####################################################################
diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt
index 8e27eca14c..17e0496b2c 100644
--- a/src/imports/window/CMakeLists.txt
+++ b/src/imports/window/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
qt_add_qml_module(windowplugin
- TARGET_PATH "QtQuick/Window.2"
URI "QtQuick.Window"
VERSION "2.15"
DESIGNER_SUPPORTED
@@ -27,4 +26,4 @@ qt_add_qml_module(windowplugin
#### Keys ignored in scope 1:.:.:window.pro:<TRUE>:
# CXX_MODULE = "qml"
# IMPORT_VERSION = "2.15"
-# TARGETPATH = "QtQuick/Window.2"
+# TARGETPATH = "QtQuick/Window"
diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt
index 8e82b70346..b711cf4593 100644
--- a/src/imports/workerscript/CMakeLists.txt
+++ b/src/imports/workerscript/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
qt_add_qml_module(workerscriptplugin
- TARGET_PATH "QtQml/WorkerScript.2"
URI "QtQml.WorkerScript"
VERSION "2.15"
DESIGNER_SUPPORTED
@@ -24,4 +23,4 @@ qt_add_qml_module(workerscriptplugin
#### Keys ignored in scope 1:.:.:workerscript.pro:<TRUE>:
# CXX_MODULE = "qml"
# IMPORT_VERSION = "2.15"
-# TARGETPATH = "QtQml/WorkerScript.2"
+# TARGETPATH = "QtQml/WorkerScript"
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
index 1a82389d2f..f6deceb5ae 100644
--- a/src/particles/CMakeLists.txt
+++ b/src/particles/CMakeLists.txt
@@ -102,7 +102,7 @@ qt_add_resource(QuickParticles "particles1"
# IMPORT_VERSION = "2.15"
# MODULE = "quickparticles"
# QMLTYPES_FILENAME = "plugins.qmltypes"
-# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick/Particles.2"
+# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick/Particles"
# QML_IMPORT_NAME = "QtQuick.Particles"
## Scopes:
@@ -134,7 +134,7 @@ set_target_properties(QuickParticles PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 2.15
QT_QML_MODULE_URI QtQuick.Particles
- QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick/Particles.2"
+ QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick/Particles"
)
qt6_qml_type_registration(QuickParticles)
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt
index 21fc09bfee..fdb59c1ea4 100644
--- a/src/qml/.prev_CMakeLists.txt
+++ b/src/qml/.prev_CMakeLists.txt
@@ -76,6 +76,7 @@ qt_add_module(Qml
debugger/qqmldebugserviceinterfaces_p.h
debugger/qqmldebugstatesdelegate_p.h
debugger/qqmlprofiler_p.h
+ inlinecomponentutils_p.h
jsapi/qjsengine.cpp jsapi/qjsengine.h jsapi/qjsengine_p.h
jsapi/qjsvalue.cpp jsapi/qjsvalue.h jsapi/qjsvalue_p.h
jsapi/qjsvalueiterator.cpp jsapi/qjsvalueiterator.h jsapi/qjsvalueiterator_p.h
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index 95eabdcf7f..b61850f610 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -76,6 +76,7 @@ qt_add_module(Qml
debugger/qqmldebugserviceinterfaces_p.h
debugger/qqmldebugstatesdelegate_p.h
debugger/qqmlprofiler_p.h
+ inlinecomponentutils_p.h
jsapi/qjsengine.cpp jsapi/qjsengine.h jsapi/qjsengine_p.h
jsapi/qjsvalue.cpp jsapi/qjsvalue.h jsapi/qjsvalue_p.h
jsapi/qjsvalueiterator.cpp jsapi/qjsvalueiterator.h jsapi/qjsvalueiterator_p.h
diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt
index ca8dcadebc..7247812a29 100644
--- a/src/qmlmodels/CMakeLists.txt
+++ b/src/qmlmodels/CMakeLists.txt
@@ -25,7 +25,7 @@ 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.2"
+# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/Models"
# QML_IMPORT_NAME = "QtQml.Models"
## Scopes:
@@ -69,7 +69,7 @@ set_target_properties(QmlModels PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 2.15
QT_QML_MODULE_URI QtQml.Models
- QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/Models.2"
+ QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/Models"
)
qt6_qml_type_registration(QmlModels)
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt
index 0a27479d36..22fc4e4709 100644
--- a/src/qmlworkerscript/.prev_CMakeLists.txt
+++ b/src/qmlworkerscript/.prev_CMakeLists.txt
@@ -48,7 +48,7 @@ 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.2"
+# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript"
# QML_IMPORT_NAME = "QtQml.WorkerScript"
## Scopes:
@@ -105,7 +105,7 @@ set_target_properties(QmlWorkerScript PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 2.15
QT_QML_MODULE_URI QtQml.WorkerScript
- QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript.2"
+ QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript"
)
qt6_qml_type_registration(QmlWorkerScript)
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt
index 1ecc6d03f7..c7f7b60c7d 100644
--- a/src/qmlworkerscript/CMakeLists.txt
+++ b/src/qmlworkerscript/CMakeLists.txt
@@ -48,7 +48,7 @@ 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.2"
+# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript"
# QML_IMPORT_NAME = "QtQml.WorkerScript"
## Scopes:
@@ -105,7 +105,7 @@ set_target_properties(QmlWorkerScript PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 2.15
QT_QML_MODULE_URI QtQml.WorkerScript
- QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript.2"
+ QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript"
)
qt6_qml_type_registration(QmlWorkerScript)
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 23324a4307..e1e8669886 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -350,7 +350,7 @@ 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"
+# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick"
# QML_IMPORT_NAME = "QtQuick"
## Scopes:
@@ -361,12 +361,17 @@ qt_extend_target(Quick CONDITION QT_FEATURE_qml_network
Qt::Network
)
+qt_extend_target(Quick CONDITION QT_FEATURE_opengl
+ LIBRARIES
+ Qt::OpenGLPrivate
+)
+
qt_extend_target(Quick CONDITION MSVC
DEFINES
_CRT_SECURE_NO_WARNINGS
)
-#### Keys ignored in scope 4:.:.:quick.pro:solaris-cc_x_:
+#### Keys ignored in scope 5:.:.:quick.pro:solaris-cc_x_:
# QMAKE_CXXFLAGS_RELEASE = "--O2"
qt_extend_target(Quick CONDITION WIN32 AND NOT WINRT
@@ -568,7 +573,7 @@ qt_extend_target(Quick CONDITION QT_FEATURE_opengl AND QT_FEATURE_quick_shaderef
items/qquickopenglshadereffectnode.cpp items/qquickopenglshadereffectnode_p.h
)
-#### Keys ignored in scope 40:.:items:items/items.pri:QT_FEATURE_opengl:
+#### Keys ignored in scope 41:.:items:items/items.pri:QT_FEATURE_opengl:
# OTHER_FILES = "$$PWD/shaders/shadereffect.vert" "$$PWD/shaders/shadereffect.frag" "$$PWD/shaders/shadereffectfallback.vert" "$$PWD/shaders/shadereffectfallback.frag" "$$PWD/shaders/shadereffect_core.vert" "$$PWD/shaders/shadereffect_core.frag" "$$PWD/shaders/shadereffectfallback_core.vert" "$$PWD/shaders/shadereffectfallback_core.frag"
qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas
@@ -598,7 +603,7 @@ set_target_properties(Quick PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 2.15
QT_QML_MODULE_URI QtQuick
- QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick.2"
+ QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick"
)
qt6_qml_type_registration(Quick)
diff --git a/tests/auto/quick/CMakeLists.txt b/tests/auto/quick/CMakeLists.txt
index 488150c61c..187600dbf9 100644
--- a/tests/auto/quick/CMakeLists.txt
+++ b/tests/auto/quick/CMakeLists.txt
@@ -22,7 +22,7 @@ if(QT_FEATURE_private_tests)
add_subdirectory(qquickstates)
add_subdirectory(qquicksystempalette)
add_subdirectory(qquicktimeline)
- add_subdirectory(pointerhandlers)
+ # add_subdirectory(pointerhandlers) # skip building until fixed in dev # special case
add_subdirectory(qquickaccessible)
add_subdirectory(qquickanchors)
add_subdirectory(qquickanimatedimage)
@@ -44,7 +44,7 @@ if(QT_FEATURE_private_tests)
add_subdirectory(qquicktableview)
add_subdirectory(qquickloader)
add_subdirectory(qquickmousearea)
- add_subdirectory(qquickmultipointtoucharea)
+ # add_subdirectory(qquickmultipointtoucharea) # skip building until fixed in dev # special case
add_subdirectory(qquickpainteditem)
add_subdirectory(qquickshape)
add_subdirectory(qquickpathview)
@@ -62,7 +62,7 @@ if(QT_FEATURE_private_tests)
add_subdirectory(qquickcanvasitem)
add_subdirectory(qquickdesignersupport)
add_subdirectory(qquickscreen)
- add_subdirectory(touchmouse)
+ # add_subdirectory(touchmouse) # skip building until fixed in dev # special case
add_subdirectory(scenegraph)
add_subdirectory(sharedimage)
endif()
diff --git a/tests/auto/quick/nokeywords/CMakeLists.txt b/tests/auto/quick/nokeywords/CMakeLists.txt
index 1158d2cf4a..23ca61f299 100644
--- a/tests/auto/quick/nokeywords/CMakeLists.txt
+++ b/tests/auto/quick/nokeywords/CMakeLists.txt
@@ -20,3 +20,8 @@ qt_add_test(tst_nokeywords
## Scopes:
#####################################################################
+
+qt_extend_target(tst_nokeywords CONDITION QT_FEATURE_opengl
+ LIBRARIES
+ Qt::OpenGLPrivate
+)
diff --git a/tests/benchmarks/qml/painting/CMakeLists.txt b/tests/benchmarks/qml/painting/CMakeLists.txt
index a194328db1..93ae5e9ef7 100644
--- a/tests/benchmarks/qml/painting/CMakeLists.txt
+++ b/tests/benchmarks/qml/painting/CMakeLists.txt
@@ -10,10 +10,11 @@ qt_add_benchmark(painting
PUBLIC_LIBRARIES
Qt::Gui
Qt::OpenGL
+ Qt::Widgets
)
#### Keys ignored in scope 1:.:.:painting.pro:<TRUE>:
-# _REQUIREMENTS = "qtHaveModule(opengl)"
+# _REQUIREMENTS = "qtHaveModule(opengl)" "qtHaveModule(widgets)"
## Scopes:
#####################################################################
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 13:36:57 +0000