summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.cmake.conf2
-rw-r--r--.qmake.conf2
-rw-r--r--CMakeLists.txt3
-rw-r--r--dependencies.yaml4
-rw-r--r--examples/qml/xmlhttprequest/CMakeLists.txt55
-rw-r--r--examples/quick/animation/CMakeLists.txt75
-rw-r--r--examples/quick/canvas/CMakeLists.txt75
-rw-r--r--examples/quick/delegatechooser/CMakeLists.txt75
-rw-r--r--examples/quick/draganddrop/CMakeLists.txt75
-rw-r--r--examples/quick/externaldraganddrop/CMakeLists.txt75
-rw-r--r--examples/quick/imageelements/CMakeLists.txt75
-rw-r--r--examples/quick/localstorage/localstorage/CMakeLists.txt75
-rw-r--r--examples/quick/particles/affectors/CMakeLists.txt230
-rw-r--r--examples/quick/particles/emitters/CMakeLists.txt230
-rw-r--r--examples/quick/particles/imageparticle/CMakeLists.txt230
-rw-r--r--examples/quick/particles/itemparticle/CMakeLists.txt230
-rw-r--r--examples/quick/particles/system/CMakeLists.txt230
-rw-r--r--examples/quick/positioners/CMakeLists.txt75
-rw-r--r--examples/quick/rendercontrol/CMakeLists.txt2
-rw-r--r--examples/quick/rendercontrol/rendercontrol.pro2
-rw-r--r--examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt1
-rw-r--r--examples/quick/rendercontrol/rendercontrol_d3d11/engine.cpp10
-rw-r--r--examples/quick/rendercontrol/rendercontrol_d3d11/engine.h4
-rw-r--r--examples/quick/rendercontrol/rendercontrol_d3d11/rendercontrol_d3d11.pro2
-rw-r--r--examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp2
-rw-r--r--examples/quick/righttoleft/CMakeLists.txt75
-rw-r--r--examples/quick/text/.prev_CMakeLists.txt75
-rw-r--r--examples/quick/text/CMakeLists.txt75
-rw-r--r--examples/quick/threading/CMakeLists.txt75
-rw-r--r--examples/quick/touchinteraction/CMakeLists.txt75
-rw-r--r--examples/quick/views/CMakeLists.txt75
-rw-r--r--examples/quick/window/CMakeLists.txt75
-rw-r--r--src/3rdparty/masm/wtf/PageBlock.cpp2
-rw-r--r--src/3rdparty/masm/wtf/PageBlock.h5
-rw-r--r--src/particles/CMakeLists.txt1
-rw-r--r--src/particles/qquickparticleaffector_p.h3
-rw-r--r--src/particles/qquickparticleflatset_p.h156
-rw-r--r--src/particles/qquickparticlesystem.cpp2
-rw-r--r--src/particles/qquickparticlesystem_p.h3
-rw-r--r--src/qml/compiler/qv4compilerscanfunctions.cpp23
-rw-r--r--src/qml/doc/src/cppintegration/definetypes.qdoc15
-rw-r--r--src/qml/doc/src/qmlfunctions.qdoc10
-rw-r--r--src/qml/doc/src/qmllanguageref/syntax/signals.qdoc53
-rw-r--r--src/qml/jsapi/qjsengine.cpp11
-rw-r--r--src/qml/jsruntime/qv4engine.cpp6
-rw-r--r--src/qml/jsruntime/qv4stackframe_p.h4
-rw-r--r--src/qml/qml/qqmlmetatypedata.cpp2
-rw-r--r--src/qmldebug/qqmlprofilerevent_p.h1
-rw-r--r--src/qmlmodels/qqmllistaccessor.cpp1
-rw-r--r--src/quick/CMakeLists.txt111
-rw-r--r--src/quick/accessible/qaccessiblequickitem.cpp2
-rw-r--r--src/quick/doc/qtquick.qdocconf3
-rw-r--r--src/quick/handlers/qquickdraghandler.cpp11
-rw-r--r--src/quick/handlers/qquickmultipointhandler.cpp16
-rw-r--r--src/quick/handlers/qquickpointerhandler.cpp38
-rw-r--r--src/quick/items/qquickdroparea.cpp1
-rw-r--r--src/quick/items/qquickitem.cpp13
-rw-r--r--src/quick/items/qquickrendercontrol.cpp20
-rw-r--r--src/quick/items/qquicktableview.cpp78
-rw-r--r--src/quick/items/qquicktext.cpp2
-rw-r--r--src/quick/items/qquicktextedit.cpp8
-rw-r--r--src/quick/items/qquicktextnodeengine.cpp5
-rw-r--r--src/quick/items/qquickwindow.cpp15
-rw-r--r--src/quick/scenegraph/qsgdefaultcontext.cpp7
-rw-r--r--src/quick/util/qquickdeliveryagent.cpp31
-rw-r--r--src/quick/util/qquickdeliveryagent_p.h1
-rw-r--r--src/quick/util/qquickdeliveryagent_p_p.h1
-rw-r--r--src/quick/util/qquickstyledtext.cpp6
-rw-r--r--tests/auto/qml/qmlcachegen/CMakeLists.txt9
-rw-r--r--tests/auto/qml/qqmllanguage/data/variantListConversion.qml7
-rw-r--r--tests/auto/qml/qqmllanguage/testtypes.cpp3
-rw-r--r--tests/auto/qml/qqmllanguage/testtypes.h48
-rw-r--r--tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp19
-rw-r--r--tests/auto/qml/qqmlmetatype/data/revisionedGroupedPropertiesUnversioned.qml5
-rw-r--r--tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp23
-rw-r--r--tests/auto/qml/qqmltranslation/CMakeLists.txt10
-rw-r--r--tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt5
-rw-r--r--tests/auto/qmltest/CMakeLists.txt1
-rw-r--r--tests/auto/qmltest/pixel/CMakeLists.txt12
-rw-r--r--tests/auto/quick/pointerhandlers/qquickdraghandler/data/dragAndWheel.qml32
-rw-r--r--tests/auto/quick/pointerhandlers/qquickdraghandler/data/dragHandlerUnderModalLayer.qml34
-rw-r--r--tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp127
-rw-r--r--tests/auto/quick/pointerhandlers/qquickpinchhandler/tst_qquickpinchhandler.cpp4
-rw-r--r--tests/auto/quick/pointerhandlers/qquicktaphandler/data/simpleTapHandler.qml (renamed from tests/auto/qmltest/pixel/tst_pixel.qml)46
-rw-r--r--tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp55
-rw-r--r--tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp15
-rw-r--r--tests/auto/quick/qquickgridview/BLACKLIST2
-rw-r--r--tests/auto/quick/qquicktableview/tst_qquicktableview.cpp78
-rw-r--r--tests/manual/mousearea/CMakeLists.txt55
-rw-r--r--tests/manual/pointer/CMakeLists.txt55
-rw-r--r--tests/manual/pointer/pinchHandler.qml8
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/activity/activity.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/atlas/atlas.qml8
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/basic/basic.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/basic/basic_alpha.qml4
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/culling/culling_1.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_16.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_2.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_4.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_8.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_1.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_2.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_1.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_2.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/image/async.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/image/source.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/layer/layer.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_1.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_2.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_1.qml4
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_2.qml4
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/live/samesource.qml4
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/property.qml4
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator_stall.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/source/one-source.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/source/switch_1.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/source/switch_2.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/source/two-sources.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/source/visible_1.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/source/visible_2.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/texture/size.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shaders/wrap/modes.qml2
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic.fragbin813 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic_alpha.fragbin951 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/cmyk.fragbin1923 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/culling.fragbin1259 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/desaturate.fragbin1343 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/edge.fragbin1831 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient.fragbin1061 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient2.fragbin1064 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient3.fragbin1059 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient4.fragbin1057 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient5.fragbin1050 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradientgrid.fragbin1458 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/property.fragbin1197 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/shadow.fragbin2041 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/stencil.fragbin1122 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/subrect.vertbin1707 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/wave.vertbin1799 -> 0 bytes
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/basic.frag9
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha.frag9
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha_rhi.frag10
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/basic_rhi.frag8
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk.frag28
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk_rhi.frag18
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/compile.bat18
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/culling.frag18
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/culling_rhi.frag13
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate.frag11
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate_rhi.frag12
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/edge.frag33
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/edge_rhi.frag23
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/gradient.frag12
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2.frag12
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2_rhi.frag10
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3.frag12
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3_rhi.frag10
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4.frag12
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4_rhi.frag10
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5.frag12
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5_rhi.frag10
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/gradient_rhi.frag10
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid.frag12
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid_rhi.frag13
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/property.frag16
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/property_rhi.frag14
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/shadow.frag33
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/shadow_rhi.frag23
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/stencil.frag14
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/stencil_rhi.frag11
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/subrect.vert20
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/subrect_rhi.vert17
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/wave.vert18
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shaders/wave_rhi.vert18
-rw-r--r--tests/manual/scenegraph_lancelot/data/shared/shared.qrc38
-rw-r--r--tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt168
-rw-r--r--tests/manual/text/CMakeLists.txt56
-rw-r--r--tests/manual/touch/CMakeLists.txt56
-rw-r--r--tools/qmlcachegen/qtquickcompiler.prf2
-rw-r--r--tools/qmlscene/main.cpp2
185 files changed, 1610 insertions, 3013 deletions
diff --git a/.cmake.conf b/.cmake.conf
index 213991f589..e80f9d0c26 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.1.0")
+set(QT_REPO_MODULE_VERSION "6.1.2")
diff --git a/.qmake.conf b/.qmake.conf
index 33bd156cc1..952622618e 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ CONFIG += warning_clean
DEFINES += QT_NO_JAVA_STYLE_ITERATORS
-MODULE_VERSION = 6.1.0
+MODULE_VERSION = 6.1.2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd17f4a3c1..b8e843afb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,9 @@ project(QtDeclarative # special case
# special case begin
# Make sure we only use latest private CMake API, aka no compatibility wrappers.
set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE)
+
+# Make sure we use the fixed BASE argument of qt_add_resource.
+set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE)
# special case end
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case
diff --git a/dependencies.yaml b/dependencies.yaml
index 8160fdda5d..7f408bd99b 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,7 +1,7 @@
dependencies:
../qtbase:
- ref: 61f56d9bb73ea6a273f90fe83f6013b4a698048e
+ ref: a225719ae8a5920ad00e20ffe35807fdce059953
required: true
../qtsvg:
- ref: 89ebcf748106d3f62e07e59b2e8c834d7807b320
+ ref: 136e7e1784c10ecdf92adc2318f13487c3447e4c
required: false
diff --git a/examples/qml/xmlhttprequest/CMakeLists.txt b/examples/qml/xmlhttprequest/CMakeLists.txt
index 235c14325f..ebb0d0c011 100644
--- a/examples/qml/xmlhttprequest/CMakeLists.txt
+++ b/examples/qml/xmlhttprequest/CMakeLists.txt
@@ -50,51 +50,18 @@ qt6_add_resources(xmlhttprequest "xmlhttprequest"
FILES
${xmlhttprequest_resource_files}
)
-set_source_files_properties("../../quick/shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../../quick/shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../../quick/shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../../quick/shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../../quick/shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../../quick/shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../../quick/shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../../quick/shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../../quick/shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../../quick/shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../../quick/shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
set(quick_shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/slider_handle.png"
+ "../../quick/shared/Button.qml"
+ "../../quick/shared/CheckBox.qml"
+ "../../quick/shared/Label.qml"
+ "../../quick/shared/LauncherList.qml"
+ "../../quick/shared/SimpleLauncherDelegate.qml"
+ "../../quick/shared/Slider.qml"
+ "../../quick/shared/TextField.qml"
+ "../../quick/shared/images/back.png"
+ "../../quick/shared/images/checkmark.png"
+ "../../quick/shared/images/next.png"
+ "../../quick/shared/images/slider_handle.png"
)
qt6_add_resources(xmlhttprequest "quick_shared"
diff --git a/examples/quick/animation/CMakeLists.txt b/examples/quick/animation/CMakeLists.txt
index 4352823374..2f47a43d93 100644
--- a/examples/quick/animation/CMakeLists.txt
+++ b/examples/quick/animation/CMakeLists.txt
@@ -36,67 +36,22 @@ target_link_libraries(animation PUBLIC
# Resources:
-set_source_files_properties("../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../shared/Button.qml"
+ "../shared/CheckBox.qml"
+ "../shared/FlickrRssModel.qml"
+ "../shared/Label.qml"
+ "../shared/LauncherList.qml"
+ "../shared/SimpleLauncherDelegate.qml"
+ "../shared/Slider.qml"
+ "../shared/TabSet.qml"
+ "../shared/TextField.qml"
+ "../shared/images/back.png"
+ "../shared/images/checkmark.png"
+ "../shared/images/next.png"
+ "../shared/images/qt-logo.png"
+ "../shared/images/slider_handle.png"
+ "../shared/images/tab.png"
)
qt6_add_resources(animation "shared"
diff --git a/examples/quick/canvas/CMakeLists.txt b/examples/quick/canvas/CMakeLists.txt
index ef978ee80b..9cf589846e 100644
--- a/examples/quick/canvas/CMakeLists.txt
+++ b/examples/quick/canvas/CMakeLists.txt
@@ -56,67 +56,22 @@ qt6_add_resources(canvas "canvas"
FILES
${canvas_resource_files}
)
-set_source_files_properties("../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../shared/Button.qml"
+ "../shared/CheckBox.qml"
+ "../shared/FlickrRssModel.qml"
+ "../shared/Label.qml"
+ "../shared/LauncherList.qml"
+ "../shared/SimpleLauncherDelegate.qml"
+ "../shared/Slider.qml"
+ "../shared/TabSet.qml"
+ "../shared/TextField.qml"
+ "../shared/images/back.png"
+ "../shared/images/checkmark.png"
+ "../shared/images/next.png"
+ "../shared/images/qt-logo.png"
+ "../shared/images/slider_handle.png"
+ "../shared/images/tab.png"
)
qt6_add_resources(canvas "shared"
diff --git a/examples/quick/delegatechooser/CMakeLists.txt b/examples/quick/delegatechooser/CMakeLists.txt
index dc45ad5c3c..ab9d1537ac 100644
--- a/examples/quick/delegatechooser/CMakeLists.txt
+++ b/examples/quick/delegatechooser/CMakeLists.txt
@@ -46,67 +46,22 @@ qt6_add_resources(delegatechooser "qml"
FILES
${qml_resource_files}
)
-set_source_files_properties("../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../shared/Button.qml"
+ "../shared/CheckBox.qml"
+ "../shared/FlickrRssModel.qml"
+ "../shared/Label.qml"
+ "../shared/LauncherList.qml"
+ "../shared/SimpleLauncherDelegate.qml"
+ "../shared/Slider.qml"
+ "../shared/TabSet.qml"
+ "../shared/TextField.qml"
+ "../shared/images/back.png"
+ "../shared/images/checkmark.png"
+ "../shared/images/next.png"
+ "../shared/images/qt-logo.png"
+ "../shared/images/slider_handle.png"
+ "../shared/images/tab.png"
)
qt6_add_resources(delegatechooser "shared"
diff --git a/examples/quick/draganddrop/CMakeLists.txt b/examples/quick/draganddrop/CMakeLists.txt
index fe0107938a..2f84c9cca8 100644
--- a/examples/quick/draganddrop/CMakeLists.txt
+++ b/examples/quick/draganddrop/CMakeLists.txt
@@ -51,67 +51,22 @@ qt6_add_resources(draganddrop "draganddrop"
FILES
${draganddrop_resource_files}
)
-set_source_files_properties("../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../shared/Button.qml"
+ "../shared/CheckBox.qml"
+ "../shared/FlickrRssModel.qml"
+ "../shared/Label.qml"
+ "../shared/LauncherList.qml"
+ "../shared/SimpleLauncherDelegate.qml"
+ "../shared/Slider.qml"
+ "../shared/TabSet.qml"
+ "../shared/TextField.qml"
+ "../shared/images/back.png"
+ "../shared/images/checkmark.png"
+ "../shared/images/next.png"
+ "../shared/images/qt-logo.png"
+ "../shared/images/slider_handle.png"
+ "../shared/images/tab.png"
)
qt6_add_resources(draganddrop "shared"
diff --git a/examples/quick/externaldraganddrop/CMakeLists.txt b/examples/quick/externaldraganddrop/CMakeLists.txt
index 2f801b3045..26a9f7271c 100644
--- a/examples/quick/externaldraganddrop/CMakeLists.txt
+++ b/examples/quick/externaldraganddrop/CMakeLists.txt
@@ -47,67 +47,22 @@ qt6_add_resources(externaldraganddrop "externaldraganddrop"
FILES
${externaldraganddrop_resource_files}
)
-set_source_files_properties("../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../shared/Button.qml"
+ "../shared/CheckBox.qml"
+ "../shared/FlickrRssModel.qml"
+ "../shared/Label.qml"
+ "../shared/LauncherList.qml"
+ "../shared/SimpleLauncherDelegate.qml"
+ "../shared/Slider.qml"
+ "../shared/TabSet.qml"
+ "../shared/TextField.qml"
+ "../shared/images/back.png"
+ "../shared/images/checkmark.png"
+ "../shared/images/next.png"
+ "../shared/images/qt-logo.png"
+ "../shared/images/slider_handle.png"
+ "../shared/images/tab.png"
)
qt6_add_resources(externaldraganddrop "shared"
diff --git a/examples/quick/imageelements/CMakeLists.txt b/examples/quick/imageelements/CMakeLists.txt
index ea354c3305..1ffb16694d 100644
--- a/examples/quick/imageelements/CMakeLists.txt
+++ b/examples/quick/imageelements/CMakeLists.txt
@@ -69,67 +69,22 @@ qt6_add_resources(imageelements "imageelements"
FILES
${imageelements_resource_files}
)
-set_source_files_properties("../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../shared/Button.qml"
+ "../shared/CheckBox.qml"
+ "../shared/FlickrRssModel.qml"
+ "../shared/Label.qml"
+ "../shared/LauncherList.qml"
+ "../shared/SimpleLauncherDelegate.qml"
+ "../shared/Slider.qml"
+ "../shared/TabSet.qml"
+ "../shared/TextField.qml"
+ "../shared/images/back.png"
+ "../shared/images/checkmark.png"
+ "../shared/images/next.png"
+ "../shared/images/qt-logo.png"
+ "../shared/images/slider_handle.png"
+ "../shared/images/tab.png"
)
qt6_add_resources(imageelements "shared"
diff --git a/examples/quick/localstorage/localstorage/CMakeLists.txt b/examples/quick/localstorage/localstorage/CMakeLists.txt
index db32a5e2eb..b8778545cb 100644
--- a/examples/quick/localstorage/localstorage/CMakeLists.txt
+++ b/examples/quick/localstorage/localstorage/CMakeLists.txt
@@ -51,67 +51,22 @@ qt6_add_resources(localstorage "localstorage"
FILES
${localstorage_resource_files}
)
-set_source_files_properties("../../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../../shared/Button.qml"
+ "../../shared/CheckBox.qml"
+ "../../shared/FlickrRssModel.qml"
+ "../../shared/Label.qml"
+ "../../shared/LauncherList.qml"
+ "../../shared/SimpleLauncherDelegate.qml"
+ "../../shared/Slider.qml"
+ "../../shared/TabSet.qml"
+ "../../shared/TextField.qml"
+ "../../shared/images/back.png"
+ "../../shared/images/checkmark.png"
+ "../../shared/images/next.png"
+ "../../shared/images/qt-logo.png"
+ "../../shared/images/slider_handle.png"
+ "../../shared/images/tab.png"
)
qt6_add_resources(localstorage "shared"
diff --git a/examples/quick/particles/affectors/CMakeLists.txt b/examples/quick/particles/affectors/CMakeLists.txt
index 1e65a15d2e..4766ee1100 100644
--- a/examples/quick/particles/affectors/CMakeLists.txt
+++ b/examples/quick/particles/affectors/CMakeLists.txt
@@ -57,131 +57,38 @@ qt6_add_resources(affectors "affectors"
FILES
${affectors_resource_files}
)
-set_source_files_properties("../images/_explo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/_explo.png"
-)
-set_source_files_properties("../images/backgroundLeaves.jpg"
- PROPERTIES QT_RESOURCE_ALIAS "images/backgroundLeaves.jpg"
-)
-set_source_files_properties("../images/bear_tiles.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/bear_tiles.png"
-)
-set_source_files_properties("../images/candle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/candle.png"
-)
-set_source_files_properties("../images/colortable.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/colortable.png"
-)
-set_source_files_properties("../images/finalfrontier.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/finalfrontier.png"
-)
-set_source_files_properties("../images/flower.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/flower.png"
-)
-set_source_files_properties("../images/matchmask.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/matchmask.png"
-)
-set_source_files_properties("../images/meteor.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteor.png"
-)
-set_source_files_properties("../images/meteor_explo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteor_explo.png"
-)
-set_source_files_properties("../images/meteors.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteors.png"
-)
-set_source_files_properties("../images/nullRock.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/nullRock.png"
-)
-set_source_files_properties("../images/particle2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particle2.png"
-)
-set_source_files_properties("../images/particle3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particle3.png"
-)
-set_source_files_properties("../images/particleA.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particleA.png"
-)
-set_source_files_properties("../images/portal_bg.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/portal_bg.png"
-)
-set_source_files_properties("../images/realLeaf1.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf1.png"
-)
-set_source_files_properties("../images/realLeaf2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf2.png"
-)
-set_source_files_properties("../images/realLeaf3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf3.png"
-)
-set_source_files_properties("../images/realLeaf4.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf4.png"
-)
-set_source_files_properties("../images/rocket.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/rocket.png"
-)
-set_source_files_properties("../images/rocket2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/rocket2.png"
-)
-set_source_files_properties("../images/sizeInOut.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/sizeInOut.png"
-)
-set_source_files_properties("../images/snowflake.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/snowflake.png"
-)
-set_source_files_properties("../images/sparkleSize.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/sparkleSize.png"
-)
-set_source_files_properties("../images/starfish_0.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_0.png"
-)
-set_source_files_properties("../images/starfish_1.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_1.png"
-)
-set_source_files_properties("../images/starfish_2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_2.png"
-)
-set_source_files_properties("../images/starfish_3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_3.png"
-)
-set_source_files_properties("../images/starfish_4.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_4.png"
-)
-set_source_files_properties("../images/starfish_mask.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_mask.png"
-)
set(images_resource_files
- "images/_explo.png"
- "images/backgroundLeaves.jpg"
- "images/bear_tiles.png"
- "images/candle.png"
- "images/colortable.png"
- "images/finalfrontier.png"
- "images/flower.png"
- "images/matchmask.png"
- "images/meteor.png"
- "images/meteor_explo.png"
- "images/meteors.png"
- "images/nullRock.png"
- "images/particle2.png"
- "images/particle3.png"
- "images/particleA.png"
- "images/portal_bg.png"
- "images/realLeaf1.png"
- "images/realLeaf2.png"
- "images/realLeaf3.png"
- "images/realLeaf4.png"
- "images/rocket.png"
- "images/rocket2.png"
- "images/sizeInOut.png"
- "images/snowflake.png"
- "images/sparkleSize.png"
- "images/starfish_0.png"
- "images/starfish_1.png"
- "images/starfish_2.png"
- "images/starfish_3.png"
- "images/starfish_4.png"
- "images/starfish_mask.png"
+ "../images/_explo.png"
+ "../images/backgroundLeaves.jpg"
+ "../images/bear_tiles.png"
+ "../images/candle.png"
+ "../images/colortable.png"
+ "../images/finalfrontier.png"
+ "../images/flower.png"
+ "../images/matchmask.png"
+ "../images/meteor.png"
+ "../images/meteor_explo.png"
+ "../images/meteors.png"
+ "../images/nullRock.png"
+ "../images/particle2.png"
+ "../images/particle3.png"
+ "../images/particleA.png"
+ "../images/portal_bg.png"
+ "../images/realLeaf1.png"
+ "../images/realLeaf2.png"
+ "../images/realLeaf3.png"
+ "../images/realLeaf4.png"
+ "../images/rocket.png"
+ "../images/rocket2.png"
+ "../images/sizeInOut.png"
+ "../images/snowflake.png"
+ "../images/sparkleSize.png"
+ "../images/starfish_0.png"
+ "../images/starfish_1.png"
+ "../images/starfish_2.png"
+ "../images/starfish_3.png"
+ "../images/starfish_4.png"
+ "../images/starfish_mask.png"
)
qt6_add_resources(affectors "images"
@@ -192,67 +99,22 @@ qt6_add_resources(affectors "images"
FILES
${images_resource_files}
)
-set_source_files_properties("../../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../../shared/Button.qml"
+ "../../shared/CheckBox.qml"
+ "../../shared/FlickrRssModel.qml"
+ "../../shared/Label.qml"
+ "../../shared/LauncherList.qml"
+ "../../shared/SimpleLauncherDelegate.qml"
+ "../../shared/Slider.qml"
+ "../../shared/TabSet.qml"
+ "../../shared/TextField.qml"
+ "../../shared/images/back.png"
+ "../../shared/images/checkmark.png"
+ "../../shared/images/next.png"
+ "../../shared/images/qt-logo.png"
+ "../../shared/images/slider_handle.png"
+ "../../shared/images/tab.png"
)
qt6_add_resources(affectors "shared"
diff --git a/examples/quick/particles/emitters/CMakeLists.txt b/examples/quick/particles/emitters/CMakeLists.txt
index a6ca0875ce..37295148fa 100644
--- a/examples/quick/particles/emitters/CMakeLists.txt
+++ b/examples/quick/particles/emitters/CMakeLists.txt
@@ -53,131 +53,38 @@ qt6_add_resources(emitters "emitters"
FILES
${emitters_resource_files}
)
-set_source_files_properties("../images/_explo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/_explo.png"
-)
-set_source_files_properties("../images/backgroundLeaves.jpg"
- PROPERTIES QT_RESOURCE_ALIAS "images/backgroundLeaves.jpg"
-)
-set_source_files_properties("../images/bear_tiles.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/bear_tiles.png"
-)
-set_source_files_properties("../images/candle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/candle.png"
-)
-set_source_files_properties("../images/colortable.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/colortable.png"
-)
-set_source_files_properties("../images/finalfrontier.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/finalfrontier.png"
-)
-set_source_files_properties("../images/flower.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/flower.png"
-)
-set_source_files_properties("../images/matchmask.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/matchmask.png"
-)
-set_source_files_properties("../images/meteor.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteor.png"
-)
-set_source_files_properties("../images/meteor_explo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteor_explo.png"
-)
-set_source_files_properties("../images/meteors.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteors.png"
-)
-set_source_files_properties("../images/nullRock.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/nullRock.png"
-)
-set_source_files_properties("../images/particle2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particle2.png"
-)
-set_source_files_properties("../images/particle3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particle3.png"
-)
-set_source_files_properties("../images/particleA.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particleA.png"
-)
-set_source_files_properties("../images/portal_bg.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/portal_bg.png"
-)
-set_source_files_properties("../images/realLeaf1.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf1.png"
-)
-set_source_files_properties("../images/realLeaf2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf2.png"
-)
-set_source_files_properties("../images/realLeaf3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf3.png"
-)
-set_source_files_properties("../images/realLeaf4.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf4.png"
-)
-set_source_files_properties("../images/rocket.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/rocket.png"
-)
-set_source_files_properties("../images/rocket2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/rocket2.png"
-)
-set_source_files_properties("../images/sizeInOut.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/sizeInOut.png"
-)
-set_source_files_properties("../images/snowflake.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/snowflake.png"
-)
-set_source_files_properties("../images/sparkleSize.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/sparkleSize.png"
-)
-set_source_files_properties("../images/starfish_0.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_0.png"
-)
-set_source_files_properties("../images/starfish_1.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_1.png"
-)
-set_source_files_properties("../images/starfish_2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_2.png"
-)
-set_source_files_properties("../images/starfish_3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_3.png"
-)
-set_source_files_properties("../images/starfish_4.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_4.png"
-)
-set_source_files_properties("../images/starfish_mask.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_mask.png"
-)
set(images_resource_files
- "images/_explo.png"
- "images/backgroundLeaves.jpg"
- "images/bear_tiles.png"
- "images/candle.png"
- "images/colortable.png"
- "images/finalfrontier.png"
- "images/flower.png"
- "images/matchmask.png"
- "images/meteor.png"
- "images/meteor_explo.png"
- "images/meteors.png"
- "images/nullRock.png"
- "images/particle2.png"
- "images/particle3.png"
- "images/particleA.png"
- "images/portal_bg.png"
- "images/realLeaf1.png"
- "images/realLeaf2.png"
- "images/realLeaf3.png"
- "images/realLeaf4.png"
- "images/rocket.png"
- "images/rocket2.png"
- "images/sizeInOut.png"
- "images/snowflake.png"
- "images/sparkleSize.png"
- "images/starfish_0.png"
- "images/starfish_1.png"
- "images/starfish_2.png"
- "images/starfish_3.png"
- "images/starfish_4.png"
- "images/starfish_mask.png"
+ "../images/_explo.png"
+ "../images/backgroundLeaves.jpg"
+ "../images/bear_tiles.png"
+ "../images/candle.png"
+ "../images/colortable.png"
+ "../images/finalfrontier.png"
+ "../images/flower.png"
+ "../images/matchmask.png"
+ "../images/meteor.png"
+ "../images/meteor_explo.png"
+ "../images/meteors.png"
+ "../images/nullRock.png"
+ "../images/particle2.png"
+ "../images/particle3.png"
+ "../images/particleA.png"
+ "../images/portal_bg.png"
+ "../images/realLeaf1.png"
+ "../images/realLeaf2.png"
+ "../images/realLeaf3.png"
+ "../images/realLeaf4.png"
+ "../images/rocket.png"
+ "../images/rocket2.png"
+ "../images/sizeInOut.png"
+ "../images/snowflake.png"
+ "../images/sparkleSize.png"
+ "../images/starfish_0.png"
+ "../images/starfish_1.png"
+ "../images/starfish_2.png"
+ "../images/starfish_3.png"
+ "../images/starfish_4.png"
+ "../images/starfish_mask.png"
)
qt6_add_resources(emitters "images"
@@ -188,67 +95,22 @@ qt6_add_resources(emitters "images"
FILES
${images_resource_files}
)
-set_source_files_properties("../../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../../shared/Button.qml"
+ "../../shared/CheckBox.qml"
+ "../../shared/FlickrRssModel.qml"
+ "../../shared/Label.qml"
+ "../../shared/LauncherList.qml"
+ "../../shared/SimpleLauncherDelegate.qml"
+ "../../shared/Slider.qml"
+ "../../shared/TabSet.qml"
+ "../../shared/TextField.qml"
+ "../../shared/images/back.png"
+ "../../shared/images/checkmark.png"
+ "../../shared/images/next.png"
+ "../../shared/images/qt-logo.png"
+ "../../shared/images/slider_handle.png"
+ "../../shared/images/tab.png"
)
qt6_add_resources(emitters "shared"
diff --git a/examples/quick/particles/imageparticle/CMakeLists.txt b/examples/quick/particles/imageparticle/CMakeLists.txt
index 29bddbb0db..2bc34b3532 100644
--- a/examples/quick/particles/imageparticle/CMakeLists.txt
+++ b/examples/quick/particles/imageparticle/CMakeLists.txt
@@ -53,131 +53,38 @@ qt6_add_resources(imageparticle "imageparticle"
FILES
${imageparticle_resource_files}
)
-set_source_files_properties("../images/_explo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/_explo.png"
-)
-set_source_files_properties("../images/backgroundLeaves.jpg"
- PROPERTIES QT_RESOURCE_ALIAS "images/backgroundLeaves.jpg"
-)
-set_source_files_properties("../images/bear_tiles.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/bear_tiles.png"
-)
-set_source_files_properties("../images/candle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/candle.png"
-)
-set_source_files_properties("../images/colortable.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/colortable.png"
-)
-set_source_files_properties("../images/finalfrontier.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/finalfrontier.png"
-)
-set_source_files_properties("../images/flower.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/flower.png"
-)
-set_source_files_properties("../images/matchmask.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/matchmask.png"
-)
-set_source_files_properties("../images/meteor.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteor.png"
-)
-set_source_files_properties("../images/meteor_explo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteor_explo.png"
-)
-set_source_files_properties("../images/meteors.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteors.png"
-)
-set_source_files_properties("../images/nullRock.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/nullRock.png"
-)
-set_source_files_properties("../images/particle2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particle2.png"
-)
-set_source_files_properties("../images/particle3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particle3.png"
-)
-set_source_files_properties("../images/particleA.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particleA.png"
-)
-set_source_files_properties("../images/portal_bg.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/portal_bg.png"
-)
-set_source_files_properties("../images/realLeaf1.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf1.png"
-)
-set_source_files_properties("../images/realLeaf2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf2.png"
-)
-set_source_files_properties("../images/realLeaf3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf3.png"
-)
-set_source_files_properties("../images/realLeaf4.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf4.png"
-)
-set_source_files_properties("../images/rocket.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/rocket.png"
-)
-set_source_files_properties("../images/rocket2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/rocket2.png"
-)
-set_source_files_properties("../images/sizeInOut.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/sizeInOut.png"
-)
-set_source_files_properties("../images/snowflake.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/snowflake.png"
-)
-set_source_files_properties("../images/sparkleSize.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/sparkleSize.png"
-)
-set_source_files_properties("../images/starfish_0.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_0.png"
-)
-set_source_files_properties("../images/starfish_1.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_1.png"
-)
-set_source_files_properties("../images/starfish_2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_2.png"
-)
-set_source_files_properties("../images/starfish_3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_3.png"
-)
-set_source_files_properties("../images/starfish_4.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_4.png"
-)
-set_source_files_properties("../images/starfish_mask.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_mask.png"
-)
set(images_resource_files
- "images/_explo.png"
- "images/backgroundLeaves.jpg"
- "images/bear_tiles.png"
- "images/candle.png"
- "images/colortable.png"
- "images/finalfrontier.png"
- "images/flower.png"
- "images/matchmask.png"
- "images/meteor.png"
- "images/meteor_explo.png"
- "images/meteors.png"
- "images/nullRock.png"
- "images/particle2.png"
- "images/particle3.png"
- "images/particleA.png"
- "images/portal_bg.png"
- "images/realLeaf1.png"
- "images/realLeaf2.png"
- "images/realLeaf3.png"
- "images/realLeaf4.png"
- "images/rocket.png"
- "images/rocket2.png"
- "images/sizeInOut.png"
- "images/snowflake.png"
- "images/sparkleSize.png"
- "images/starfish_0.png"
- "images/starfish_1.png"
- "images/starfish_2.png"
- "images/starfish_3.png"
- "images/starfish_4.png"
- "images/starfish_mask.png"
+ "../images/_explo.png"
+ "../images/backgroundLeaves.jpg"
+ "../images/bear_tiles.png"
+ "../images/candle.png"
+ "../images/colortable.png"
+ "../images/finalfrontier.png"
+ "../images/flower.png"
+ "../images/matchmask.png"
+ "../images/meteor.png"
+ "../images/meteor_explo.png"
+ "../images/meteors.png"
+ "../images/nullRock.png"
+ "../images/particle2.png"
+ "../images/particle3.png"
+ "../images/particleA.png"
+ "../images/portal_bg.png"
+ "../images/realLeaf1.png"
+ "../images/realLeaf2.png"
+ "../images/realLeaf3.png"
+ "../images/realLeaf4.png"
+ "../images/rocket.png"
+ "../images/rocket2.png"
+ "../images/sizeInOut.png"
+ "../images/snowflake.png"
+ "../images/sparkleSize.png"
+ "../images/starfish_0.png"
+ "../images/starfish_1.png"
+ "../images/starfish_2.png"
+ "../images/starfish_3.png"
+ "../images/starfish_4.png"
+ "../images/starfish_mask.png"
)
qt6_add_resources(imageparticle "images"
@@ -188,67 +95,22 @@ qt6_add_resources(imageparticle "images"
FILES
${images_resource_files}
)
-set_source_files_properties("../../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../../shared/Button.qml"
+ "../../shared/CheckBox.qml"
+ "../../shared/FlickrRssModel.qml"
+ "../../shared/Label.qml"
+ "../../shared/LauncherList.qml"
+ "../../shared/SimpleLauncherDelegate.qml"
+ "../../shared/Slider.qml"
+ "../../shared/TabSet.qml"
+ "../../shared/TextField.qml"
+ "../../shared/images/back.png"
+ "../../shared/images/checkmark.png"
+ "../../shared/images/next.png"
+ "../../shared/images/qt-logo.png"
+ "../../shared/images/slider_handle.png"
+ "../../shared/images/tab.png"
)
qt6_add_resources(imageparticle "shared"
diff --git a/examples/quick/particles/itemparticle/CMakeLists.txt b/examples/quick/particles/itemparticle/CMakeLists.txt
index bb88ffb633..80c63de81f 100644
--- a/examples/quick/particles/itemparticle/CMakeLists.txt
+++ b/examples/quick/particles/itemparticle/CMakeLists.txt
@@ -46,131 +46,38 @@ foreach(file IN LISTS resource_glob_1)
endforeach()
# Resources:
-set_source_files_properties("../images/_explo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/_explo.png"
-)
-set_source_files_properties("../images/backgroundLeaves.jpg"
- PROPERTIES QT_RESOURCE_ALIAS "images/backgroundLeaves.jpg"
-)
-set_source_files_properties("../images/bear_tiles.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/bear_tiles.png"
-)
-set_source_files_properties("../images/candle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/candle.png"
-)
-set_source_files_properties("../images/colortable.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/colortable.png"
-)
-set_source_files_properties("../images/finalfrontier.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/finalfrontier.png"
-)
-set_source_files_properties("../images/flower.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/flower.png"
-)
-set_source_files_properties("../images/matchmask.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/matchmask.png"
-)
-set_source_files_properties("../images/meteor.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteor.png"
-)
-set_source_files_properties("../images/meteor_explo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteor_explo.png"
-)
-set_source_files_properties("../images/meteors.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteors.png"
-)
-set_source_files_properties("../images/nullRock.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/nullRock.png"
-)
-set_source_files_properties("../images/particle2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particle2.png"
-)
-set_source_files_properties("../images/particle3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particle3.png"
-)
-set_source_files_properties("../images/particleA.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particleA.png"
-)
-set_source_files_properties("../images/portal_bg.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/portal_bg.png"
-)
-set_source_files_properties("../images/realLeaf1.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf1.png"
-)
-set_source_files_properties("../images/realLeaf2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf2.png"
-)
-set_source_files_properties("../images/realLeaf3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf3.png"
-)
-set_source_files_properties("../images/realLeaf4.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf4.png"
-)
-set_source_files_properties("../images/rocket.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/rocket.png"
-)
-set_source_files_properties("../images/rocket2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/rocket2.png"
-)
-set_source_files_properties("../images/sizeInOut.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/sizeInOut.png"
-)
-set_source_files_properties("../images/snowflake.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/snowflake.png"
-)
-set_source_files_properties("../images/sparkleSize.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/sparkleSize.png"
-)
-set_source_files_properties("../images/starfish_0.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_0.png"
-)
-set_source_files_properties("../images/starfish_1.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_1.png"
-)
-set_source_files_properties("../images/starfish_2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_2.png"
-)
-set_source_files_properties("../images/starfish_3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_3.png"
-)
-set_source_files_properties("../images/starfish_4.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_4.png"
-)
-set_source_files_properties("../images/starfish_mask.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_mask.png"
-)
set(images_resource_files
- "images/_explo.png"
- "images/backgroundLeaves.jpg"
- "images/bear_tiles.png"
- "images/candle.png"
- "images/colortable.png"
- "images/finalfrontier.png"
- "images/flower.png"
- "images/matchmask.png"
- "images/meteor.png"
- "images/meteor_explo.png"
- "images/meteors.png"
- "images/nullRock.png"
- "images/particle2.png"
- "images/particle3.png"
- "images/particleA.png"
- "images/portal_bg.png"
- "images/realLeaf1.png"
- "images/realLeaf2.png"
- "images/realLeaf3.png"
- "images/realLeaf4.png"
- "images/rocket.png"
- "images/rocket2.png"
- "images/sizeInOut.png"
- "images/snowflake.png"
- "images/sparkleSize.png"
- "images/starfish_0.png"
- "images/starfish_1.png"
- "images/starfish_2.png"
- "images/starfish_3.png"
- "images/starfish_4.png"
- "images/starfish_mask.png"
+ "../images/_explo.png"
+ "../images/backgroundLeaves.jpg"
+ "../images/bear_tiles.png"
+ "../images/candle.png"
+ "../images/colortable.png"
+ "../images/finalfrontier.png"
+ "../images/flower.png"
+ "../images/matchmask.png"
+ "../images/meteor.png"
+ "../images/meteor_explo.png"
+ "../images/meteors.png"
+ "../images/nullRock.png"
+ "../images/particle2.png"
+ "../images/particle3.png"
+ "../images/particleA.png"
+ "../images/portal_bg.png"
+ "../images/realLeaf1.png"
+ "../images/realLeaf2.png"
+ "../images/realLeaf3.png"
+ "../images/realLeaf4.png"
+ "../images/rocket.png"
+ "../images/rocket2.png"
+ "../images/sizeInOut.png"
+ "../images/snowflake.png"
+ "../images/sparkleSize.png"
+ "../images/starfish_0.png"
+ "../images/starfish_1.png"
+ "../images/starfish_2.png"
+ "../images/starfish_3.png"
+ "../images/starfish_4.png"
+ "../images/starfish_mask.png"
)
qt6_add_resources(itemparticle "images"
@@ -181,67 +88,22 @@ qt6_add_resources(itemparticle "images"
FILES
${images_resource_files}
)
-set_source_files_properties("../../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../../shared/Button.qml"
+ "../../shared/CheckBox.qml"
+ "../../shared/FlickrRssModel.qml"
+ "../../shared/Label.qml"
+ "../../shared/LauncherList.qml"
+ "../../shared/SimpleLauncherDelegate.qml"
+ "../../shared/Slider.qml"
+ "../../shared/TabSet.qml"
+ "../../shared/TextField.qml"
+ "../../shared/images/back.png"
+ "../../shared/images/checkmark.png"
+ "../../shared/images/next.png"
+ "../../shared/images/qt-logo.png"
+ "../../shared/images/slider_handle.png"
+ "../../shared/images/tab.png"
)
qt6_add_resources(itemparticle "shared"
diff --git a/examples/quick/particles/system/CMakeLists.txt b/examples/quick/particles/system/CMakeLists.txt
index 737dc5f90b..91c754786f 100644
--- a/examples/quick/particles/system/CMakeLists.txt
+++ b/examples/quick/particles/system/CMakeLists.txt
@@ -51,131 +51,38 @@ qt6_add_resources(system "system"
FILES
${system_resource_files}
)
-set_source_files_properties("../images/_explo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/_explo.png"
-)
-set_source_files_properties("../images/backgroundLeaves.jpg"
- PROPERTIES QT_RESOURCE_ALIAS "images/backgroundLeaves.jpg"
-)
-set_source_files_properties("../images/bear_tiles.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/bear_tiles.png"
-)
-set_source_files_properties("../images/candle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/candle.png"
-)
-set_source_files_properties("../images/colortable.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/colortable.png"
-)
-set_source_files_properties("../images/finalfrontier.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/finalfrontier.png"
-)
-set_source_files_properties("../images/flower.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/flower.png"
-)
-set_source_files_properties("../images/matchmask.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/matchmask.png"
-)
-set_source_files_properties("../images/meteor.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteor.png"
-)
-set_source_files_properties("../images/meteor_explo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteor_explo.png"
-)
-set_source_files_properties("../images/meteors.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/meteors.png"
-)
-set_source_files_properties("../images/nullRock.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/nullRock.png"
-)
-set_source_files_properties("../images/particle2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particle2.png"
-)
-set_source_files_properties("../images/particle3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particle3.png"
-)
-set_source_files_properties("../images/particleA.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/particleA.png"
-)
-set_source_files_properties("../images/portal_bg.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/portal_bg.png"
-)
-set_source_files_properties("../images/realLeaf1.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf1.png"
-)
-set_source_files_properties("../images/realLeaf2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf2.png"
-)
-set_source_files_properties("../images/realLeaf3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf3.png"
-)
-set_source_files_properties("../images/realLeaf4.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/realLeaf4.png"
-)
-set_source_files_properties("../images/rocket.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/rocket.png"
-)
-set_source_files_properties("../images/rocket2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/rocket2.png"
-)
-set_source_files_properties("../images/sizeInOut.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/sizeInOut.png"
-)
-set_source_files_properties("../images/snowflake.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/snowflake.png"
-)
-set_source_files_properties("../images/sparkleSize.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/sparkleSize.png"
-)
-set_source_files_properties("../images/starfish_0.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_0.png"
-)
-set_source_files_properties("../images/starfish_1.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_1.png"
-)
-set_source_files_properties("../images/starfish_2.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_2.png"
-)
-set_source_files_properties("../images/starfish_3.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_3.png"
-)
-set_source_files_properties("../images/starfish_4.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_4.png"
-)
-set_source_files_properties("../images/starfish_mask.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/starfish_mask.png"
-)
set(images_resource_files
- "images/_explo.png"
- "images/backgroundLeaves.jpg"
- "images/bear_tiles.png"
- "images/candle.png"
- "images/colortable.png"
- "images/finalfrontier.png"
- "images/flower.png"
- "images/matchmask.png"
- "images/meteor.png"
- "images/meteor_explo.png"
- "images/meteors.png"
- "images/nullRock.png"
- "images/particle2.png"
- "images/particle3.png"
- "images/particleA.png"
- "images/portal_bg.png"
- "images/realLeaf1.png"
- "images/realLeaf2.png"
- "images/realLeaf3.png"
- "images/realLeaf4.png"
- "images/rocket.png"
- "images/rocket2.png"
- "images/sizeInOut.png"
- "images/snowflake.png"
- "images/sparkleSize.png"
- "images/starfish_0.png"
- "images/starfish_1.png"
- "images/starfish_2.png"
- "images/starfish_3.png"
- "images/starfish_4.png"
- "images/starfish_mask.png"
+ "../images/_explo.png"
+ "../images/backgroundLeaves.jpg"
+ "../images/bear_tiles.png"
+ "../images/candle.png"
+ "../images/colortable.png"
+ "../images/finalfrontier.png"
+ "../images/flower.png"
+ "../images/matchmask.png"
+ "../images/meteor.png"
+ "../images/meteor_explo.png"
+ "../images/meteors.png"
+ "../images/nullRock.png"
+ "../images/particle2.png"
+ "../images/particle3.png"
+ "../images/particleA.png"
+ "../images/portal_bg.png"
+ "../images/realLeaf1.png"
+ "../images/realLeaf2.png"
+ "../images/realLeaf3.png"
+ "../images/realLeaf4.png"
+ "../images/rocket.png"
+ "../images/rocket2.png"
+ "../images/sizeInOut.png"
+ "../images/snowflake.png"
+ "../images/sparkleSize.png"
+ "../images/starfish_0.png"
+ "../images/starfish_1.png"
+ "../images/starfish_2.png"
+ "../images/starfish_3.png"
+ "../images/starfish_4.png"
+ "../images/starfish_mask.png"
)
qt6_add_resources(system "images"
@@ -186,67 +93,22 @@ qt6_add_resources(system "images"
FILES
${images_resource_files}
)
-set_source_files_properties("../../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../../shared/Button.qml"
+ "../../shared/CheckBox.qml"
+ "../../shared/FlickrRssModel.qml"
+ "../../shared/Label.qml"
+ "../../shared/LauncherList.qml"
+ "../../shared/SimpleLauncherDelegate.qml"
+ "../../shared/Slider.qml"
+ "../../shared/TabSet.qml"
+ "../../shared/TextField.qml"
+ "../../shared/images/back.png"
+ "../../shared/images/checkmark.png"
+ "../../shared/images/next.png"
+ "../../shared/images/qt-logo.png"
+ "../../shared/images/slider_handle.png"
+ "../../shared/images/tab.png"
)
qt6_add_resources(system "shared"
diff --git a/examples/quick/positioners/CMakeLists.txt b/examples/quick/positioners/CMakeLists.txt
index 07205cbfa5..572f53e56c 100644
--- a/examples/quick/positioners/CMakeLists.txt
+++ b/examples/quick/positioners/CMakeLists.txt
@@ -48,67 +48,22 @@ qt6_add_resources(positioners "positioners"
FILES
${positioners_resource_files}
)
-set_source_files_properties("../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../shared/Button.qml"
+ "../shared/CheckBox.qml"
+ "../shared/FlickrRssModel.qml"
+ "../shared/Label.qml"
+ "../shared/LauncherList.qml"
+ "../shared/SimpleLauncherDelegate.qml"
+ "../shared/Slider.qml"
+ "../shared/TabSet.qml"
+ "../shared/TextField.qml"
+ "../shared/images/back.png"
+ "../shared/images/checkmark.png"
+ "../shared/images/next.png"
+ "../shared/images/qt-logo.png"
+ "../shared/images/slider_handle.png"
+ "../shared/images/tab.png"
)
qt6_add_resources(positioners "shared"
diff --git a/examples/quick/rendercontrol/CMakeLists.txt b/examples/quick/rendercontrol/CMakeLists.txt
index 53924b33ce..db19a3fc79 100644
--- a/examples/quick/rendercontrol/CMakeLists.txt
+++ b/examples/quick/rendercontrol/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from rendercontrol.pro.
add_subdirectory(rendercontrol_opengl)
-if(WIN32 AND NOT MINGW)
+if(WIN32)
add_subdirectory(rendercontrol_d3d11)
endif()
diff --git a/examples/quick/rendercontrol/rendercontrol.pro b/examples/quick/rendercontrol/rendercontrol.pro
index 9922e1e077..d49be63c50 100644
--- a/examples/quick/rendercontrol/rendercontrol.pro
+++ b/examples/quick/rendercontrol/rendercontrol.pro
@@ -3,7 +3,7 @@ TEMPLATE = subdirs
SUBDIRS += \
rendercontrol_opengl
-win32:!mingw {
+win32 {
SUBDIRS += \
rendercontrol_d3d11
}
diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt
index 949c609af1..afb1149fc6 100644
--- a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt
+++ b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt
@@ -37,6 +37,7 @@ target_link_libraries(rendercontrol_d3d11 PUBLIC
d3d11
dxgi
dxguid
+ uuid
)
diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/engine.cpp b/examples/quick/rendercontrol/rendercontrol_d3d11/engine.cpp
index 99f65f6200..9dd65696d0 100644
--- a/examples/quick/rendercontrol/rendercontrol_d3d11/engine.cpp
+++ b/examples/quick/rendercontrol/rendercontrol_d3d11/engine.cpp
@@ -85,7 +85,6 @@ bool Engine::create()
return false;
}
- ID3D11DeviceContext *ctx = nullptr;
uint flags = 0;
#ifdef ENABLE_DEBUG_LAYER
flags |= D3D11_CREATE_DEVICE_DEBUG;
@@ -93,19 +92,12 @@ bool Engine::create()
// use the default hardware adapter
HRESULT hr = D3D11CreateDevice(nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr, flags,
nullptr, 0, D3D11_SDK_VERSION,
- &m_device, &m_featureLevel, &ctx);
+ &m_device, &m_featureLevel, &m_context);
if (FAILED(hr)) {
qWarning("Failed to create D3D11 device and context: %s", qPrintable(comErrorMessage(hr)));
return false;
}
- if (SUCCEEDED(ctx->QueryInterface(IID_ID3D11DeviceContext1, reinterpret_cast<void **>(&m_context)))) {
- ctx->Release();
- } else {
- qWarning("ID3D11DeviceContext1 not supported");
- return false;
- }
-
return true;
}
diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/engine.h b/examples/quick/rendercontrol/rendercontrol_d3d11/engine.h
index 8b1b3ebf39..fdfee578ed 100644
--- a/examples/quick/rendercontrol/rendercontrol_d3d11/engine.h
+++ b/examples/quick/rendercontrol/rendercontrol_d3d11/engine.h
@@ -81,14 +81,14 @@ public:
Swapchain createSwapchain(QWindow *window);
void resizeSwapchain(Swapchain *sc, QWindow *window);
ID3D11Device *device() { return m_device; }
- ID3D11DeviceContext1 *context() { return m_context; }
+ ID3D11DeviceContext *context() { return m_context; }
private:
void createSwapchainBuffers(Swapchain *sc);
IDXGIFactory1 *m_dxgiFactory = nullptr;
ID3D11Device *m_device = nullptr;
- ID3D11DeviceContext1 *m_context = nullptr;
+ ID3D11DeviceContext *m_context = nullptr;
D3D_FEATURE_LEVEL m_featureLevel;
};
diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/rendercontrol_d3d11.pro b/examples/quick/rendercontrol/rendercontrol_d3d11/rendercontrol_d3d11.pro
index 29cee7580b..0a65dec88a 100644
--- a/examples/quick/rendercontrol/rendercontrol_d3d11/rendercontrol_d3d11.pro
+++ b/examples/quick/rendercontrol/rendercontrol_d3d11/rendercontrol_d3d11.pro
@@ -13,7 +13,7 @@ HEADERS += \
RESOURCES += rendercontrol.qrc
-LIBS += -ld3d11 -ldxgi -ldxguid
+LIBS += -ld3d11 -ldxgi -ldxguid -luuid
target.path = $$[QT_INSTALL_EXAMPLES]/quick/rendercontrol/rendercontrol_d3d11
INSTALLS += target
diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp b/examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp
index 918698effe..478ce88344 100644
--- a/examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp
+++ b/examples/quick/rendercontrol/rendercontrol_d3d11/window.cpp
@@ -316,7 +316,7 @@ void Window::render()
updateQuick();
// now onto our own drawing, targeting the window
- ID3D11DeviceContext1 *ctx = m_engine->context();
+ ID3D11DeviceContext *ctx = m_engine->context();
const QSize viewSize = m_swapchain.pixelSize;
const float clearColor[] = { 0.4f, 0.7f, 0.0f, 1.0f };
diff --git a/examples/quick/righttoleft/CMakeLists.txt b/examples/quick/righttoleft/CMakeLists.txt
index 5faf4bda61..377792aced 100644
--- a/examples/quick/righttoleft/CMakeLists.txt
+++ b/examples/quick/righttoleft/CMakeLists.txt
@@ -49,67 +49,22 @@ qt6_add_resources(righttoleft "righttoleft"
FILES
${righttoleft_resource_files}
)
-set_source_files_properties("../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../shared/Button.qml"
+ "../shared/CheckBox.qml"
+ "../shared/FlickrRssModel.qml"
+ "../shared/Label.qml"
+ "../shared/LauncherList.qml"
+ "../shared/SimpleLauncherDelegate.qml"
+ "../shared/Slider.qml"
+ "../shared/TabSet.qml"
+ "../shared/TextField.qml"
+ "../shared/images/back.png"
+ "../shared/images/checkmark.png"
+ "../shared/images/next.png"
+ "../shared/images/qt-logo.png"
+ "../shared/images/slider_handle.png"
+ "../shared/images/tab.png"
)
qt6_add_resources(righttoleft "shared"
diff --git a/examples/quick/text/.prev_CMakeLists.txt b/examples/quick/text/.prev_CMakeLists.txt
index 20d4228bcf..ada8f2b376 100644
--- a/examples/quick/text/.prev_CMakeLists.txt
+++ b/examples/quick/text/.prev_CMakeLists.txt
@@ -65,67 +65,22 @@ qt6_add_resources(text "text"
FILES
${text_resource_files}
)
-set_source_files_properties("../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../shared/Button.qml"
+ "../shared/CheckBox.qml"
+ "../shared/FlickrRssModel.qml"
+ "../shared/Label.qml"
+ "../shared/LauncherList.qml"
+ "../shared/SimpleLauncherDelegate.qml"
+ "../shared/Slider.qml"
+ "../shared/TabSet.qml"
+ "../shared/TextField.qml"
+ "../shared/images/back.png"
+ "../shared/images/checkmark.png"
+ "../shared/images/next.png"
+ "../shared/images/qt-logo.png"
+ "../shared/images/slider_handle.png"
+ "../shared/images/tab.png"
)
qt6_add_resources(text "shared"
diff --git a/examples/quick/text/CMakeLists.txt b/examples/quick/text/CMakeLists.txt
index f4e7e7de38..570b0a59df 100644
--- a/examples/quick/text/CMakeLists.txt
+++ b/examples/quick/text/CMakeLists.txt
@@ -65,67 +65,22 @@ qt6_add_resources(text "text"
FILES
${text_resource_files}
)
-set_source_files_properties("../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../shared/Button.qml"
+ "../shared/CheckBox.qml"
+ "../shared/FlickrRssModel.qml"
+ "../shared/Label.qml"
+ "../shared/LauncherList.qml"
+ "../shared/SimpleLauncherDelegate.qml"
+ "../shared/Slider.qml"
+ "../shared/TabSet.qml"
+ "../shared/TextField.qml"
+ "../shared/images/back.png"
+ "../shared/images/checkmark.png"
+ "../shared/images/next.png"
+ "../shared/images/qt-logo.png"
+ "../shared/images/slider_handle.png"
+ "../shared/images/tab.png"
)
qt6_add_resources(text "shared"
diff --git a/examples/quick/threading/CMakeLists.txt b/examples/quick/threading/CMakeLists.txt
index 3dcc58158e..cb1a13835b 100644
--- a/examples/quick/threading/CMakeLists.txt
+++ b/examples/quick/threading/CMakeLists.txt
@@ -51,67 +51,22 @@ qt6_add_resources(threading "threading"
FILES
${threading_resource_files}
)
-set_source_files_properties("../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../shared/Button.qml"
+ "../shared/CheckBox.qml"
+ "../shared/FlickrRssModel.qml"
+ "../shared/Label.qml"
+ "../shared/LauncherList.qml"
+ "../shared/SimpleLauncherDelegate.qml"
+ "../shared/Slider.qml"
+ "../shared/TabSet.qml"
+ "../shared/TextField.qml"
+ "../shared/images/back.png"
+ "../shared/images/checkmark.png"
+ "../shared/images/next.png"
+ "../shared/images/qt-logo.png"
+ "../shared/images/slider_handle.png"
+ "../shared/images/tab.png"
)
qt6_add_resources(threading "shared"
diff --git a/examples/quick/touchinteraction/CMakeLists.txt b/examples/quick/touchinteraction/CMakeLists.txt
index af3219ac7d..4435a6a307 100644
--- a/examples/quick/touchinteraction/CMakeLists.txt
+++ b/examples/quick/touchinteraction/CMakeLists.txt
@@ -68,67 +68,22 @@ qt6_add_resources(touchinteraction "touchinteraction"
FILES
${touchinteraction_resource_files}
)
-set_source_files_properties("../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../shared/Button.qml"
+ "../shared/CheckBox.qml"
+ "../shared/FlickrRssModel.qml"
+ "../shared/Label.qml"
+ "../shared/LauncherList.qml"
+ "../shared/SimpleLauncherDelegate.qml"
+ "../shared/Slider.qml"
+ "../shared/TabSet.qml"
+ "../shared/TextField.qml"
+ "../shared/images/back.png"
+ "../shared/images/checkmark.png"
+ "../shared/images/next.png"
+ "../shared/images/qt-logo.png"
+ "../shared/images/slider_handle.png"
+ "../shared/images/tab.png"
)
qt6_add_resources(touchinteraction "shared"
diff --git a/examples/quick/views/CMakeLists.txt b/examples/quick/views/CMakeLists.txt
index 9951bd48ff..53ced26e55 100644
--- a/examples/quick/views/CMakeLists.txt
+++ b/examples/quick/views/CMakeLists.txt
@@ -91,67 +91,22 @@ qt6_add_resources(views "views"
FILES
${views_resource_files}
)
-set_source_files_properties("../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../shared/Button.qml"
+ "../shared/CheckBox.qml"
+ "../shared/FlickrRssModel.qml"
+ "../shared/Label.qml"
+ "../shared/LauncherList.qml"
+ "../shared/SimpleLauncherDelegate.qml"
+ "../shared/Slider.qml"
+ "../shared/TabSet.qml"
+ "../shared/TextField.qml"
+ "../shared/images/back.png"
+ "../shared/images/checkmark.png"
+ "../shared/images/next.png"
+ "../shared/images/qt-logo.png"
+ "../shared/images/slider_handle.png"
+ "../shared/images/tab.png"
)
qt6_add_resources(views "shared"
diff --git a/examples/quick/window/CMakeLists.txt b/examples/quick/window/CMakeLists.txt
index 4fa2bcac4c..ca9f75b082 100644
--- a/examples/quick/window/CMakeLists.txt
+++ b/examples/quick/window/CMakeLists.txt
@@ -49,67 +49,22 @@ qt6_add_resources(window "window"
FILES
${window_resource_files}
)
-set_source_files_properties("../shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../shared/FlickrRssModel.qml"
- PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml"
-)
-set_source_files_properties("../shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../shared/TabSet.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml"
-)
-set_source_files_properties("../shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../shared/images/qt-logo.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png"
-)
-set_source_files_properties("../shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
-set_source_files_properties("../shared/images/tab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/tab.png"
-)
set(shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "FlickrRssModel.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TabSet.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/qt-logo.png"
- "images/slider_handle.png"
- "images/tab.png"
+ "../shared/Button.qml"
+ "../shared/CheckBox.qml"
+ "../shared/FlickrRssModel.qml"
+ "../shared/Label.qml"
+ "../shared/LauncherList.qml"
+ "../shared/SimpleLauncherDelegate.qml"
+ "../shared/Slider.qml"
+ "../shared/TabSet.qml"
+ "../shared/TextField.qml"
+ "../shared/images/back.png"
+ "../shared/images/checkmark.png"
+ "../shared/images/next.png"
+ "../shared/images/qt-logo.png"
+ "../shared/images/slider_handle.png"
+ "../shared/images/tab.png"
)
qt6_add_resources(window "shared"
diff --git a/src/3rdparty/masm/wtf/PageBlock.cpp b/src/3rdparty/masm/wtf/PageBlock.cpp
index e715ed262a..bc0e8d6f2d 100644
--- a/src/3rdparty/masm/wtf/PageBlock.cpp
+++ b/src/3rdparty/masm/wtf/PageBlock.cpp
@@ -64,6 +64,7 @@ inline size_t systemPageSize()
#endif
+inline namespace hidden {
size_t pageSize()
{
if (!s_pageSize)
@@ -78,5 +79,6 @@ size_t pageMask()
s_pageMask = ~(pageSize() - 1);
return s_pageMask;
}
+}
} // namespace WTF
diff --git a/src/3rdparty/masm/wtf/PageBlock.h b/src/3rdparty/masm/wtf/PageBlock.h
index 09e4048239..d85c39cb33 100644
--- a/src/3rdparty/masm/wtf/PageBlock.h
+++ b/src/3rdparty/masm/wtf/PageBlock.h
@@ -28,8 +28,13 @@
namespace WTF {
+// avoid false positive detection by apple
+// by putting the function inside an inline namespace
+// to obtain different name mangling
+inline namespace hidden {
WTF_EXPORT_PRIVATE size_t pageSize();
WTF_EXPORT_PRIVATE size_t pageMask();
+}
inline bool isPageAligned(void* address) { return !(reinterpret_cast<intptr_t>(address) & (pageSize() - 1)); }
inline bool isPageAligned(size_t size) { return !(size & (pageSize() - 1)); }
inline bool isPowerOfTwo(size_t size) { return !(size & (size - 1)); }
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
index 9ffa6564c2..e801d0b936 100644
--- a/src/particles/CMakeLists.txt
+++ b/src/particles/CMakeLists.txt
@@ -24,7 +24,6 @@ qt_internal_add_module(QuickParticles
qquickparticleaffector.cpp qquickparticleaffector_p.h
qquickparticleemitter.cpp qquickparticleemitter_p.h
qquickparticleextruder.cpp qquickparticleextruder_p.h
- qquickparticleflatset_p.h
qquickparticlegroup.cpp qquickparticlegroup_p.h
qquickparticlepainter.cpp qquickparticlepainter_p.h
qquickparticlesmodule.cpp qquickparticlesmodule_p.h
diff --git a/src/particles/qquickparticleaffector_p.h b/src/particles/qquickparticleaffector_p.h
index 4f60389e04..79446a23a1 100644
--- a/src/particles/qquickparticleaffector_p.h
+++ b/src/particles/qquickparticleaffector_p.h
@@ -55,7 +55,6 @@
#include "qquickparticlesystem_p.h"
#include "qquickparticleextruder_p.h"
#include "qtquickparticlesglobal_p.h"
-#include "qquickparticleflatset_p.h"
QT_BEGIN_NAMESPACE
@@ -197,7 +196,7 @@ protected:
static const qreal simulationCutoff;
QPointF m_offset;
- QtQuickParticlesPrivate::QFlatSet<QPair<int, int>> m_onceOffed;
+ QSet<QPair<int, int>> m_onceOffed;
private:
QSet<int> m_groupIds;
bool m_updateIntSet;
diff --git a/src/particles/qquickparticleflatset_p.h b/src/particles/qquickparticleflatset_p.h
deleted file mode 100644
index 6d0650a12b..0000000000
--- a/src/particles/qquickparticleflatset_p.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQuick module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQUICKPARTICLEFLATSET_P_H
-#define QQUICKPARTICLEFLATSET_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtGlobal>
-
-#include <vector>
-#include <algorithm>
-#include <iterator>
-
-QT_BEGIN_NAMESPACE
-
-// Minimal API, just for the consumption of Qt Quick Particles.
-// For extra safety, it's in a private namespace
-
-namespace QtQuickParticlesPrivate {
-
-template <typename T>
-class QFlatSet
-{
-public:
- using iterator = typename std::vector<T>::iterator;
- using const_iterator = typename std::vector<T>::const_iterator;
- using value_type = typename std::vector<T>::value_type;
- using size_type = int;
-
- iterator find(const T &t)
- {
- return std::find(begin(), end(), t);
- }
-
- const_iterator find(const T &t) const
- {
- return std::find(begin(), end(), t);
- }
-
- bool contains(const T &t) const
- {
- return find(t) != end();
- }
-
- void clear()
- {
- m_data.clear();
- }
-
- void reserve(int capacity)
- {
- m_data.reserve(capacity);
- }
-
- iterator insert(const T &t)
- {
- auto i = find(t);
- if (i != end())
- return i;
- T copy = t;
- m_data.push_back(std::move(copy));
- return std::prev(m_data.end());
- }
-
- iterator insert(T &&t)
- {
- auto i = find(t);
- if (i != end())
- return i;
- m_data.push_back(std::move(t));
- return std::prev(m_data.end());
- }
-
- size_type remove(const T &t)
- {
- auto i = std::find(m_data.begin(), m_data.end(), t);
- if (i != m_data.end()) {
- m_data.erase(i);
- return 1;
- }
- return 0;
- }
-
- iterator operator<<(const T &t)
- {
- return insert(t);
- }
-
- iterator operator<<(T &&t)
- {
- return insert(std::move(t));
- }
-
- iterator begin() { return m_data.begin(); }
- const_iterator begin() const { return m_data.begin(); }
- const_iterator cbegin() const { return m_data.cbegin(); }
-
- iterator end() { return m_data.end(); }
- const_iterator end() const { return m_data.end(); }
- const_iterator cend() const { return m_data.cend(); }
-
-private:
- std::vector<T> m_data;
-};
-
-} // namespace QtQuickParticlesPrivate
-
-QT_END_NAMESPACE
-
-#endif // QQUICKPARTICLEFLATSET_P_H
diff --git a/src/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp
index 4eabbde970..5806d7914c 100644
--- a/src/particles/qquickparticlesystem.cpp
+++ b/src/particles/qquickparticlesystem.cpp
@@ -214,7 +214,7 @@ QQuickParticleDataHeap::QQuickParticleDataHeap()
void QQuickParticleDataHeap::grow() //###Consider automatic growth vs resize() calls from GroupData
{
- m_data.resize(1 << ++m_size);
+ m_data.resize(qsizetype(1) << ++m_size);
}
void QQuickParticleDataHeap::insert(QQuickParticleData* data)
diff --git a/src/particles/qquickparticlesystem_p.h b/src/particles/qquickparticlesystem_p.h
index 2f2e10d264..0ae2a5f345 100644
--- a/src/particles/qquickparticlesystem_p.h
+++ b/src/particles/qquickparticlesystem_p.h
@@ -63,7 +63,6 @@
#include <private/qv4global_p.h>
#include <private/qv4staticvalue_p.h>
#include "qtquickparticlesglobal_p.h"
-#include "qquickparticleflatset_p.h"
QT_BEGIN_NAMESPACE
@@ -412,7 +411,7 @@ public:
int systemSync(QQuickParticlePainter* p);
//Data members here for ease of related class and auto-test usage. Not "public" API. TODO: d_ptrize
- QtQuickParticlesPrivate::QFlatSet<QQuickParticleData*> needsReset;
+ QSet<QQuickParticleData*> needsReset;
QVector<QQuickParticleData*> bySysIdx; //Another reference to the data (data owned by group), but by sysIdx
QQuickStochasticEngine* stateEngine;
diff --git a/src/qml/compiler/qv4compilerscanfunctions.cpp b/src/qml/compiler/qv4compilerscanfunctions.cpp
index ebc9a86a16..f07a5a0513 100644
--- a/src/qml/compiler/qv4compilerscanfunctions.cpp
+++ b/src/qml/compiler/qv4compilerscanfunctions.cpp
@@ -107,6 +107,7 @@ void ScanFunctions::leaveEnvironment()
void ScanFunctions::checkDirectivePrologue(StatementList *ast)
{
+ Q_ASSERT(_context);
for (StatementList *it = ast; it; it = it->next) {
if (ExpressionStatement *expr = cast<ExpressionStatement *>(it->statement)) {
if (StringLiteral *strLit = cast<StringLiteral *>(expr->expression)) {
@@ -131,6 +132,7 @@ void ScanFunctions::checkDirectivePrologue(StatementList *ast)
void ScanFunctions::checkName(QStringView name, const QQmlJS::SourceLocation &loc)
{
+ Q_ASSERT(_context);
if (_context->isStrict) {
if (name == QLatin1String("implements")
|| name == QLatin1String("interface")
@@ -161,6 +163,7 @@ void ScanFunctions::endVisit(Program *)
bool ScanFunctions::visit(ESModule *ast)
{
enterEnvironment(ast, defaultProgramType, QStringLiteral("%ModuleCode"));
+ Q_ASSERT(_context);
_context->isStrict = true;
return true;
}
@@ -172,6 +175,7 @@ void ScanFunctions::endVisit(ESModule *)
bool ScanFunctions::visit(ExportDeclaration *declaration)
{
+ Q_ASSERT(_context);
QString module;
if (declaration->fromClause) {
module = declaration->fromClause->moduleSpecifier.toString();
@@ -262,6 +266,7 @@ bool ScanFunctions::visit(ExportDeclaration *declaration)
bool ScanFunctions::visit(ImportDeclaration *declaration)
{
+ Q_ASSERT(_context);
QString module;
if (declaration->fromClause) {
module = declaration->fromClause->moduleSpecifier.toString();
@@ -310,6 +315,7 @@ bool ScanFunctions::visit(ImportDeclaration *declaration)
bool ScanFunctions::visit(CallExpression *ast)
{
+ Q_ASSERT(_context);
if (!_context->hasDirectEval) {
if (IdentifierExpression *id = cast<IdentifierExpression *>(ast->base)) {
if (id->name == QLatin1String("eval")) {
@@ -324,6 +330,7 @@ bool ScanFunctions::visit(CallExpression *ast)
bool ScanFunctions::visit(PatternElement *ast)
{
+ Q_ASSERT(_context);
if (!ast->isVariableDeclaration())
return true;
@@ -359,6 +366,7 @@ bool ScanFunctions::visit(PatternElement *ast)
bool ScanFunctions::visit(IdentifierExpression *ast)
{
+ Q_ASSERT(_context);
checkName(ast->name, ast->identifierToken);
if (_context->usesArgumentsObject == Context::ArgumentsObjectUnknown && ast->name == QLatin1String("arguments"))
_context->usesArgumentsObject = Context::ArgumentsObjectUsed;
@@ -395,6 +403,7 @@ bool ScanFunctions::visit(FunctionExpression *ast)
bool ScanFunctions::visit(ClassExpression *ast)
{
enterEnvironment(ast, ContextType::Block, QStringLiteral("%Class"));
+ Q_ASSERT(_context);
_context->isStrict = true;
_context->hasNestedFunctions = true;
if (!ast->name.isEmpty())
@@ -409,6 +418,7 @@ void ScanFunctions::endVisit(ClassExpression *)
bool ScanFunctions::visit(ClassDeclaration *ast)
{
+ Q_ASSERT(_context);
if (!ast->name.isEmpty())
_context->addLocalVar(ast->name.toString(), Context::VariableDeclaration, AST::VariableScope::Let);
@@ -459,6 +469,7 @@ bool ScanFunctions::visit(FieldMemberExpression *ast)
_cg->throwSyntaxError(ast->identifierToken, QLatin1String("Expected 'target' after 'new.'."));
return false;
}
+ Q_ASSERT(_context);
Context *c = _context;
bool needContext = false;
while (c->contextType == ContextType::Block || c->isArrowFunction) {
@@ -485,6 +496,7 @@ bool ScanFunctions::visit(ArrayPattern *ast)
bool ScanFunctions::enterFunction(FunctionExpression *ast, bool enterName)
{
+ Q_ASSERT(_context);
if (_context->isStrict && (ast->name == QLatin1String("eval") || ast->name == QLatin1String("arguments")))
_cg->throwSyntaxError(ast->identifierToken, QStringLiteral("Function name may not be eval or arguments in strict mode"));
return enterFunction(ast, ast->name.toString(), ast->formals, ast->body, enterName);
@@ -557,10 +569,13 @@ void ScanFunctions::endVisit(ForStatement *)
leaveEnvironment();
}
-bool ScanFunctions::visit(ForEachStatement *ast) {
+bool ScanFunctions::visit(ForEachStatement *ast)
+{
enterEnvironment(ast, ContextType::Block, QStringLiteral("%Foreach"));
- if (ast->expression)
+ if (ast->expression) {
+ Q_ASSERT(_context);
_context->lastBlockInitializerLocation = ast->expression->lastSourceLocation();
+ }
Node::accept(ast->lhs, this);
Node::accept(ast->expression, this);
@@ -577,6 +592,7 @@ void ScanFunctions::endVisit(ForEachStatement *)
bool ScanFunctions::visit(ThisExpression *)
{
+ Q_ASSERT(_context);
_context->usesThis = true;
return false;
}
@@ -607,6 +623,7 @@ void ScanFunctions::endVisit(CaseBlock *)
bool ScanFunctions::visit(Catch *ast)
{
+ Q_ASSERT(_context);
TemporaryBoolAssignment allowFuncDecls(_allowFuncDecls, _context->isStrict ? false : _allowFuncDecls);
enterEnvironment(ast, ContextType::Block, QStringLiteral("%CatchBlock"));
_context->isCatchBlock = true;
@@ -634,6 +651,7 @@ void ScanFunctions::endVisit(Catch *)
bool ScanFunctions::visit(WithStatement *ast)
{
+ Q_ASSERT(_context);
Node::accept(ast->expression, this);
TemporaryBoolAssignment allowFuncDecls(_allowFuncDecls, _context->isStrict ? false : _allowFuncDecls);
@@ -676,6 +694,7 @@ bool ScanFunctions::enterFunction(Node *ast, const QString &name, FormalParamete
outerContext->usesArgumentsObject = Context::ArgumentsObjectNotUsed;
}
+ Q_ASSERT(_context);
_context->name = name;
if (formals && formals->containsName(QStringLiteral("arguments")))
_context->usesArgumentsObject = Context::ArgumentsObjectNotUsed;
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc
index 2fdd6edded..aeff2b5776 100644
--- a/src/qml/doc/src/cppintegration/definetypes.qdoc
+++ b/src/qml/doc/src/cppintegration/definetypes.qdoc
@@ -70,6 +70,21 @@ exposed to QML but the type itself should not be instantiable.
For a quick guide to choosing the correct approach to expose C++ types to QML,
see \l {Choosing the Correct Integration Method Between C++ and QML}.
+\section2 Preconditions
+
+All the macros mentioned below are available from the \c qqml.h
+header. You need to add the following code to the files using them in order to
+make the macros available:
+
+\code
+#include <QtQml/qqml.h>
+\endcode
+
+Furthermore, your class declarations have to live in headers reachable via your
+project's include path. The declarations are used to generate registration code
+at compile time, and the registration code needs to include the headers that
+contain the declarations.
+
\section2 Registering an Instantiable Object Type
\b{Any QObject-derived C++ class can be registered as the definition of a
diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc
index f48a5f475b..92d9bdec49 100644
--- a/src/qml/doc/src/qmlfunctions.qdoc
+++ b/src/qml/doc/src/qmlfunctions.qdoc
@@ -730,16 +730,6 @@
*/
/*!
- \fn int qmlRegisterType()
- \relates QQmlEngine
- \overload
- \deprecated
-
- Do not use this function. For anonymous type registrations, use \l qmlRegisterAnonymousType(),
- and make sure to provide a URI and a major version.
-*/
-
-/*!
\fn int qmlRegisterInterface(const char *typeName)
\relates QQmlEngine
diff --git a/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc b/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc
index 8cc13e5e9c..4cb438f85d 100644
--- a/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc
+++ b/src/qml/doc/src/qmllanguageref/syntax/signals.qdoc
@@ -85,7 +85,9 @@ This type of signal is a \e {property change signal} and signal handlers for
these signals are written in the form \e on<Property>Changed, where
\e <Property> is the name of the property, with the first letter capitalized.
-For example, the \l MouseArea type has a \l {MouseArea::pressed}{pressed} property. To receive a notification whenever this property changes, write a signal handler named \c onPressedChanged:
+For example, the \l MouseArea type has a \l {MouseArea::pressed}{pressed} property.
+To receive a notification whenever this property changes, write a signal handler
+named \c onPressedChanged:
\qml
import QtQuick
@@ -104,6 +106,55 @@ Even though the \l TapHandler documentation does not document a signal handler
named \c onPressedChanged, the signal is implicitly provided by the fact that
the \c pressed property exists.
+\section2 Signal parameters
+
+Signals might have parameters. To access those, you should assign a function to the handler. Both
+arrow functions and anonymous functions work.
+
+For the following examples, consider a Status component with an errorOccurred signal (see
+\l{Adding signals to custom QML types} for more information about how signals can be added to
+QML components).
+
+\qml
+// Status.qml
+import QtQuick
+
+Item {
+ id: myitem
+ signal errorOccurred(message: string, line: int, column: int)
+}
+\endqml
+
+\qml
+Status {
+ onErrorOccurred: (mgs, line, col) => console.log(`${line}:${col}: ${msg}`)
+}
+\endqml
+
+\note The names of the formal parameters in the function do not have to match those in the
+signal.
+
+If you do not need to handle all parameters, it is possible to omit trailing ones:
+\qml
+Status {
+ onErrorOccurred: function (message) { console.log(message) }
+}
+\endqml
+
+It is not possible to leave out leading parameters you are interested in, however you can use some
+placeholder name to indicate to readers that they are not important:
+\qml
+Status {
+ onErrorOccurred: (_, _, col) => console.log(`Error happened at column ${col}`)
+}
+\endqml
+
+\note Instead of using a function, it is possible, but discouraged, to use a plain code block. In
+that case all signal parameters get injected into the scope of the block. However, this can make
+code difficult to read as it's unclear where the parameters come from, and results in slower
+lookups in the QML engine. Injecting parameters in this way is deprecated, and will cause runtime
+warnings if the parameter is actually used.
+
\section2 Using the Connections type
In some cases it may be desirable to access a signal outside of the object that
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp
index 37b5306897..b1db348287 100644
--- a/src/qml/jsapi/qjsengine.cpp
+++ b/src/qml/jsapi/qjsengine.cpp
@@ -1076,7 +1076,7 @@ QJSEngine *qjsEngine(const QObject *object)
two different engines will not be valid if one of these engines is deleted. This option is similar
to QScriptEngine::ScriptOwnership.
- Generally an application doesn't need to set an object's ownership explicitly. the JavaScript
+ Generally an application doesn't need to set an object's ownership explicitly. The JavaScript
memory manager uses a heuristic to set the default ownership. By default, an object that is
created by the JavaScript memory manager has JavaScriptOwnership. The exception to this are the
root objects created by calling QQmlComponent::create() or QQmlComponent::beginCreate(), which
@@ -1089,10 +1089,17 @@ QJSEngine *qjsEngine(const QObject *object)
but not to property getter invocations.
Calling setObjectOwnership() overrides the default ownership.
+
+ \sa {Data Ownership}
*/
/*!
Sets the \a ownership of \a object.
+
+ An object with \c JavaScriptOwnership is not garbage collected as long
+ as it still has a parent, even if there are no references to it.
+
+ \sa QJSEngine::ObjectOwnership
*/
void QJSEngine::setObjectOwnership(QObject *object, ObjectOwnership ownership)
{
@@ -1109,6 +1116,8 @@ void QJSEngine::setObjectOwnership(QObject *object, ObjectOwnership ownership)
/*!
Returns the ownership of \a object.
+
+ \sa QJSEngine::ObjectOwnership
*/
QJSEngine::ObjectOwnership QJSEngine::objectOwnership(QObject *object)
{
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 21aee81985..1fcdfa8f6f 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -1605,7 +1605,9 @@ static QVariant toVariant(QV4::ExecutionEngine *e, const QV4::Value &value, int
}
asVariant = toVariant(e, arrayValue, valueMetaType.id(), false,
visitedObjects);
- if (valueMetaType.id() != QMetaType::QVariant) {
+ if (valueMetaType == QMetaType::fromType<QVariant>()) {
+ retnAsIterable.metaContainer().addValue(retn.data(), &asVariant);
+ } else {
auto originalType = asVariant.metaType();
bool couldConvert = asVariant.convert(valueMetaType);
if (!couldConvert) {
@@ -1616,8 +1618,8 @@ static QVariant toVariant(QV4::ExecutionEngine *e, const QV4::Value &value, int
// create default constructed value
asVariant = QVariant(valueMetaType, nullptr);
}
+ retnAsIterable.metaContainer().addValue(retn.data(), asVariant.constData());
}
- retnAsIterable.metaContainer().addValue(retn.data(), asVariant.constData());
}
return retn;
}
diff --git a/src/qml/jsruntime/qv4stackframe_p.h b/src/qml/jsruntime/qv4stackframe_p.h
index 616fa9a5a9..9b6b5322bd 100644
--- a/src/qml/jsruntime/qv4stackframe_p.h
+++ b/src/qml/jsruntime/qv4stackframe_p.h
@@ -134,7 +134,9 @@ struct Q_QML_EXPORT CppStackFrame {
argc = nFormals;
jsFrame->setArgc(argc);
- memcpy(jsFrame->args, originalArguments, argc*sizeof(Value));
+ // memcpy requires non-null ptr, even if argc*sizeof(Value) == 0
+ if (originalArguments)
+ memcpy(jsFrame->args, originalArguments, argc*sizeof(Value));
Q_STATIC_ASSERT(Encode::undefined() == 0);
memset(jsFrame->args + argc, 0, (nRegisters - argc)*sizeof(Value));
diff --git a/src/qml/qml/qqmlmetatypedata.cpp b/src/qml/qml/qqmlmetatypedata.cpp
index e973226053..a77419d0e0 100644
--- a/src/qml/qml/qqmlmetatypedata.cpp
+++ b/src/qml/qml/qqmlmetatypedata.cpp
@@ -172,7 +172,7 @@ QQmlPropertyCache *QQmlMetaTypeData::propertyCache(const QQmlType &type, QTypeRe
: (version.hasMinorVersion()
? QTypeRevision::fromVersion(type.version().majorVersion(),
version.minorVersion())
- : type.version());
+ : QTypeRevision::fromMajorVersion(type.version().majorVersion()));
while (metaObject) {
QQmlType t = QQmlMetaType::qmlType(metaObject, type.module(), combinedVersion);
diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h
index 928cda716e..29c6f86123 100644
--- a/src/qmldebug/qqmlprofilerevent_p.h
+++ b/src/qmldebug/qqmlprofilerevent_p.h
@@ -48,6 +48,7 @@
#include <QtCore/qmetatype.h>
#include <initializer_list>
+#include <limits>
#include <type_traits>
//
diff --git a/src/qmlmodels/qqmllistaccessor.cpp b/src/qmlmodels/qqmllistaccessor.cpp
index 7412dd0146..ea336138ce 100644
--- a/src/qmlmodels/qqmllistaccessor.cpp
+++ b/src/qmlmodels/qqmllistaccessor.cpp
@@ -105,6 +105,7 @@ void QQmlListAccessor::setList(const QVariant &v, QQmlEngine *engine)
m_type = Invalid;
} else {
m_type = Integer;
+ d = i;
}
} else if ((!enginePrivate && QQmlMetaType::isQObject(d.userType())) ||
(enginePrivate && enginePrivate->isQObject(d.userType()))) {
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index f158a40210..ffc1298532 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -221,66 +221,64 @@ qt_internal_add_module(Quick
# Resources:
set(scenegraph_resource_files
- "shaders_ng/24bittextmask.frag.qsb"
- "shaders_ng/32bitcolortext.frag.qsb"
- "shaders_ng/8bittextmask.frag.qsb"
- "shaders_ng/8bittextmask_a.frag.qsb"
- "shaders_ng/distancefieldoutlinetext.frag.qsb"
- "shaders_ng/distancefieldoutlinetext.vert.qsb"
- "shaders_ng/distancefieldoutlinetext_a.frag.qsb"
- "shaders_ng/distancefieldoutlinetext_a_fwidth.frag.qsb"
- "shaders_ng/distancefieldoutlinetext_fwidth.frag.qsb"
- "shaders_ng/distancefieldshiftedtext.frag.qsb"
- "shaders_ng/distancefieldshiftedtext.vert.qsb"
- "shaders_ng/distancefieldshiftedtext_a.frag.qsb"
- "shaders_ng/distancefieldshiftedtext_a_fwidth.frag.qsb"
- "shaders_ng/distancefieldshiftedtext_fwidth.frag.qsb"
- "shaders_ng/distancefieldtext.frag.qsb"
- "shaders_ng/distancefieldtext.vert.qsb"
- "shaders_ng/distancefieldtext_a.frag.qsb"
- "shaders_ng/distancefieldtext_a_fwidth.frag.qsb"
- "shaders_ng/distancefieldtext_fwidth.frag.qsb"
- "shaders_ng/flatcolor.frag.qsb"
- "shaders_ng/flatcolor.vert.qsb"
- "shaders_ng/hiqsubpixeldistancefieldtext.frag.qsb"
- "shaders_ng/hiqsubpixeldistancefieldtext.vert.qsb"
- "shaders_ng/hiqsubpixeldistancefieldtext_a.frag.qsb"
- "shaders_ng/loqsubpixeldistancefieldtext.frag.qsb"
- "shaders_ng/loqsubpixeldistancefieldtext.vert.qsb"
- "shaders_ng/loqsubpixeldistancefieldtext_a.frag.qsb"
- "shaders_ng/opaquetexture.frag.qsb"
- "shaders_ng/opaquetexture.vert.qsb"
- "shaders_ng/outlinedtext.frag.qsb"
- "shaders_ng/outlinedtext.vert.qsb"
- "shaders_ng/outlinedtext_a.frag.qsb"
- "shaders_ng/shadereffect.frag.qsb"
- "shaders_ng/shadereffect.vert.qsb"
- "shaders_ng/smoothcolor.frag.qsb"
- "shaders_ng/smoothcolor.vert.qsb"
- "shaders_ng/smoothtexture.frag.qsb"
- "shaders_ng/smoothtexture.vert.qsb"
- "shaders_ng/sprite.frag.qsb"
- "shaders_ng/sprite.vert.qsb"
- "shaders_ng/stencilclip.frag.qsb"
- "shaders_ng/stencilclip.vert.qsb"
- "shaders_ng/styledtext.frag.qsb"
- "shaders_ng/styledtext.vert.qsb"
- "shaders_ng/styledtext_a.frag.qsb"
- "shaders_ng/textmask.frag.qsb"
- "shaders_ng/textmask.vert.qsb"
- "shaders_ng/texture.frag.qsb"
- "shaders_ng/texture.vert.qsb"
- "shaders_ng/vertexcolor.frag.qsb"
- "shaders_ng/vertexcolor.vert.qsb"
- "shaders_ng/visualization.frag.qsb"
- "shaders_ng/visualization.vert.qsb"
+ "scenegraph/shaders_ng/24bittextmask.frag.qsb"
+ "scenegraph/shaders_ng/32bitcolortext.frag.qsb"
+ "scenegraph/shaders_ng/8bittextmask.frag.qsb"
+ "scenegraph/shaders_ng/8bittextmask_a.frag.qsb"
+ "scenegraph/shaders_ng/distancefieldoutlinetext.frag.qsb"
+ "scenegraph/shaders_ng/distancefieldoutlinetext.vert.qsb"
+ "scenegraph/shaders_ng/distancefieldoutlinetext_a.frag.qsb"
+ "scenegraph/shaders_ng/distancefieldoutlinetext_a_fwidth.frag.qsb"
+ "scenegraph/shaders_ng/distancefieldoutlinetext_fwidth.frag.qsb"
+ "scenegraph/shaders_ng/distancefieldshiftedtext.frag.qsb"
+ "scenegraph/shaders_ng/distancefieldshiftedtext.vert.qsb"
+ "scenegraph/shaders_ng/distancefieldshiftedtext_a.frag.qsb"
+ "scenegraph/shaders_ng/distancefieldshiftedtext_a_fwidth.frag.qsb"
+ "scenegraph/shaders_ng/distancefieldshiftedtext_fwidth.frag.qsb"
+ "scenegraph/shaders_ng/distancefieldtext.frag.qsb"
+ "scenegraph/shaders_ng/distancefieldtext.vert.qsb"
+ "scenegraph/shaders_ng/distancefieldtext_a.frag.qsb"
+ "scenegraph/shaders_ng/distancefieldtext_a_fwidth.frag.qsb"
+ "scenegraph/shaders_ng/distancefieldtext_fwidth.frag.qsb"
+ "scenegraph/shaders_ng/flatcolor.frag.qsb"
+ "scenegraph/shaders_ng/flatcolor.vert.qsb"
+ "scenegraph/shaders_ng/hiqsubpixeldistancefieldtext.frag.qsb"
+ "scenegraph/shaders_ng/hiqsubpixeldistancefieldtext.vert.qsb"
+ "scenegraph/shaders_ng/hiqsubpixeldistancefieldtext_a.frag.qsb"
+ "scenegraph/shaders_ng/loqsubpixeldistancefieldtext.frag.qsb"
+ "scenegraph/shaders_ng/loqsubpixeldistancefieldtext.vert.qsb"
+ "scenegraph/shaders_ng/loqsubpixeldistancefieldtext_a.frag.qsb"
+ "scenegraph/shaders_ng/opaquetexture.frag.qsb"
+ "scenegraph/shaders_ng/opaquetexture.vert.qsb"
+ "scenegraph/shaders_ng/outlinedtext.frag.qsb"
+ "scenegraph/shaders_ng/outlinedtext.vert.qsb"
+ "scenegraph/shaders_ng/outlinedtext_a.frag.qsb"
+ "scenegraph/shaders_ng/shadereffect.frag.qsb"
+ "scenegraph/shaders_ng/shadereffect.vert.qsb"
+ "scenegraph/shaders_ng/smoothcolor.frag.qsb"
+ "scenegraph/shaders_ng/smoothcolor.vert.qsb"
+ "scenegraph/shaders_ng/smoothtexture.frag.qsb"
+ "scenegraph/shaders_ng/smoothtexture.vert.qsb"
+ "scenegraph/shaders_ng/sprite.frag.qsb"
+ "scenegraph/shaders_ng/sprite.vert.qsb"
+ "scenegraph/shaders_ng/stencilclip.frag.qsb"
+ "scenegraph/shaders_ng/stencilclip.vert.qsb"
+ "scenegraph/shaders_ng/styledtext.frag.qsb"
+ "scenegraph/shaders_ng/styledtext.vert.qsb"
+ "scenegraph/shaders_ng/styledtext_a.frag.qsb"
+ "scenegraph/shaders_ng/textmask.frag.qsb"
+ "scenegraph/shaders_ng/textmask.vert.qsb"
+ "scenegraph/shaders_ng/texture.frag.qsb"
+ "scenegraph/shaders_ng/texture.vert.qsb"
+ "scenegraph/shaders_ng/vertexcolor.frag.qsb"
+ "scenegraph/shaders_ng/vertexcolor.vert.qsb"
+ "scenegraph/shaders_ng/visualization.frag.qsb"
+ "scenegraph/shaders_ng/visualization.vert.qsb"
)
qt_internal_add_resource(Quick "scenegraph"
PREFIX
- "/qt-project.org/scenegraph"
- BASE
- "scenegraph"
+ "/qt-project.org"
FILES
${scenegraph_resource_files}
)
@@ -525,4 +523,3 @@ set_target_properties(Quick PROPERTIES
)
qt6_qml_type_registration(Quick)
-
diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp
index bca03b496d..925966d2ef 100644
--- a/src/quick/accessible/qaccessiblequickitem.cpp
+++ b/src/quick/accessible/qaccessiblequickitem.cpp
@@ -216,6 +216,8 @@ QAccessible::Role QAccessibleQuickItem::role() const
if (role == QAccessible::NoRole) {
if (qobject_cast<QQuickText*>(const_cast<QQuickItem *>(item())))
role = QAccessible::StaticText;
+ else if (qobject_cast<QQuickTextInput*>(const_cast<QQuickItem *>(item())))
+ role = QAccessible::EditableText;
else
role = QAccessible::Client;
}
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 12d56a665c..c36c226cbc 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -62,7 +62,8 @@ depends += \
../../quickwidgets \
../../qmllocalstorage \
../../quicklayouts \
- ../../labs/animation
+ ../../labs/animation \
+ ../../labs/folderlistmodel
exampledirs += ../../../examples/quick \
snippets
diff --git a/src/quick/handlers/qquickdraghandler.cpp b/src/quick/handlers/qquickdraghandler.cpp
index 980481303f..9471ef7660 100644
--- a/src/quick/handlers/qquickdraghandler.cpp
+++ b/src/quick/handlers/qquickdraghandler.cpp
@@ -182,7 +182,13 @@ void QQuickDragHandler::onActiveChanged()
bool QQuickDragHandler::wantsPointerEvent(QPointerEvent *event)
{
if (!QQuickMultiPointHandler::wantsPointerEvent(event))
- return false;
+ /* Do handle other events than we would normally care about
+ while we are still doing a drag; otherwise we would suddenly
+ become inactive when a wheel event arrives during dragging.
+ This extra condition needs to be kept in sync with
+ handlePointerEventImpl */
+ if (!active())
+ return false;
#if QT_CONFIG(gestures)
if (event->type() == QEvent::NativeGesture)
@@ -194,6 +200,9 @@ bool QQuickDragHandler::wantsPointerEvent(QPointerEvent *event)
void QQuickDragHandler::handlePointerEventImpl(QPointerEvent *event)
{
+ if (active() && !QQuickMultiPointHandler::wantsPointerEvent(event))
+ return; // see QQuickDragHandler::wantsPointerEvent; we don't want to handle those events
+
QQuickMultiPointHandler::handlePointerEventImpl(event);
event->setAccepted(true);
diff --git a/src/quick/handlers/qquickmultipointhandler.cpp b/src/quick/handlers/qquickmultipointhandler.cpp
index 97cb958aa6..6f66d0e426 100644
--- a/src/quick/handlers/qquickmultipointhandler.cpp
+++ b/src/quick/handlers/qquickmultipointhandler.cpp
@@ -145,7 +145,7 @@ void QQuickMultiPointHandler::onActiveChanged()
}
}
-void QQuickMultiPointHandler::onGrabChanged(QQuickPointerHandler *, QPointingDevice::GrabTransition transition, QPointerEvent *, QEventPoint &)
+void QQuickMultiPointHandler::onGrabChanged(QQuickPointerHandler *grabber, QPointingDevice::GrabTransition transition, QPointerEvent *event, QEventPoint &point)
{
Q_D(QQuickMultiPointHandler);
// If another handler or item takes over this set of points, assume it has
@@ -154,6 +154,20 @@ void QQuickMultiPointHandler::onGrabChanged(QQuickPointerHandler *, QPointingDev
// (e.g. between DragHandler and PinchHandler).
if (transition == QPointingDevice::UngrabExclusive || transition == QPointingDevice::CancelGrabExclusive)
d->currentPoints.clear();
+ if (grabber != this)
+ return;
+ switch (transition) {
+ case QPointingDevice::GrabExclusive:
+ case QPointingDevice::GrabPassive:
+ case QPointingDevice::UngrabPassive:
+ case QPointingDevice::UngrabExclusive:
+ case QPointingDevice::CancelGrabPassive:
+ case QPointingDevice::CancelGrabExclusive:
+ QQuickPointerHandler::onGrabChanged(grabber, transition, event, point);
+ break;
+ case QPointingDevice::OverrideGrabPassive:
+ return; // don't emit
+ }
}
QVector<QEventPoint> QQuickMultiPointHandler::eligiblePoints(QPointerEvent *event)
diff --git a/src/quick/handlers/qquickpointerhandler.cpp b/src/quick/handlers/qquickpointerhandler.cpp
index 11c29ee812..b33b95eec1 100644
--- a/src/quick/handlers/qquickpointerhandler.cpp
+++ b/src/quick/handlers/qquickpointerhandler.cpp
@@ -302,7 +302,8 @@ void QQuickPointerHandler::onGrabChanged(QQuickPointerHandler *grabber, QPointin
*/
void QQuickPointerHandler::setPassiveGrab(QPointerEvent *event, const QEventPoint &point, bool grab)
{
- qCDebug(lcPointerHandlerGrab) << point << grab;
+ qCDebug(lcPointerHandlerGrab) << this << point << grab << "via"
+ << QQuickDeliveryAgentPrivate::currentOrItemDeliveryAgent(parentItem());
if (grab) {
event->addPassiveGrabber(point, this);
} else {
@@ -338,8 +339,8 @@ bool QQuickPointerHandler::approveGrabTransition(QPointerEvent *event, const QEv
{
Q_D(const QQuickPointerHandler);
bool allowed = false;
+ QObject* existingGrabber = event->exclusiveGrabber(point);
if (proposedGrabber == this) {
- QObject* existingGrabber = event->exclusiveGrabber(point);
allowed = (existingGrabber == nullptr) || ((d->grabPermissions & CanTakeOverFromAnything) == CanTakeOverFromAnything);
if (existingGrabber) {
if (QQuickPointerHandler *existingPhGrabber = qobject_cast<QQuickPointerHandler *>(event->exclusiveGrabber(point))) {
@@ -350,10 +351,14 @@ bool QQuickPointerHandler::approveGrabTransition(QPointerEvent *event, const QEv
existingPhGrabber->metaObject()->className() == metaObject()->className())
allowed = true;
} else if ((d->grabPermissions & CanTakeOverFromItems)) {
+ allowed = true;
QQuickItem * existingItemGrabber = qobject_cast<QQuickItem *>(event->exclusiveGrabber(point));
- if (existingItemGrabber && !((existingItemGrabber->keepMouseGrab() && QQuickWindowPrivate::isMouseEvent(event)) ||
- (existingItemGrabber->keepTouchGrab() && QQuickWindowPrivate::isTouchEvent(event)))) {
- allowed = true;
+ auto da = QQuickItemPrivate::get(parentItem())->deliveryAgentPrivate();
+ if (existingItemGrabber &&
+ ((existingItemGrabber->keepMouseGrab() &&
+ (QQuickWindowPrivate::isMouseEvent(event) || da->isDeliveringTouchAsMouse())) ||
+ (existingItemGrabber->keepTouchGrab() && QQuickWindowPrivate::isTouchEvent(event)))) {
+ allowed = false;
// If the handler wants to steal the exclusive grab from an Item, the Item can usually veto
// by having its keepMouseGrab flag set. But an exception is if that Item is a parent that
// normally filters events (such as a Flickable): it needs to be possible for e.g. a
@@ -362,15 +367,20 @@ bool QQuickPointerHandler::approveGrabTransition(QPointerEvent *event, const QEv
// at first and then expects to be able to steal the grab later on. It cannot respect
// Flickable's wishes in that case, because then it would never have a chance.
if (existingItemGrabber->keepMouseGrab() &&
- !(existingItemGrabber->filtersChildMouseEvents() && existingItemGrabber->isAncestorOf(parentItem()))) {
- auto da = QQuickItemPrivate::get(parentItem())->deliveryAgentPrivate();
+ existingItemGrabber->filtersChildMouseEvents() && existingItemGrabber->isAncestorOf(parentItem())) {
Q_ASSERT(da);
if (da->isDeliveringTouchAsMouse() && point.id() == da->touchMouseId) {
- qCDebug(lcPointerHandlerGrab) << this << "wants to grab touchpoint" << point.id()
- << "but declines to steal grab from touch-mouse grabber with keepMouseGrab=true" << existingItemGrabber;
- allowed = false;
+ qCDebug(lcPointerHandlerGrab) << this << "steals touchpoint" << point.id()
+ << "despite parent touch-mouse grabber with keepMouseGrab=true" << existingItemGrabber;
+ allowed = true;
}
}
+ if (!allowed) {
+ qCDebug(lcPointerHandlerGrab) << this << "wants to grab point" << point.id()
+ << "but declines to steal from grabber" << existingItemGrabber
+ << "with keepMouseGrab=" << existingItemGrabber->keepMouseGrab()
+ << "keepTouchGrab=" << existingItemGrabber->keepTouchGrab();
+ }
}
}
}
@@ -394,7 +404,8 @@ bool QQuickPointerHandler::approveGrabTransition(QPointerEvent *event, const QEv
}
qCDebug(lcPointerHandlerGrab) << "point" << Qt::hex << point.id() << "permission" <<
QMetaEnum::fromType<GrabPermissions>().valueToKeys(grabPermissions()) <<
- ':' << this << (allowed ? "approved to" : "denied to") << proposedGrabber;
+ ':' << this << (allowed ? "approved from" : "denied from") <<
+ existingGrabber << "to" << proposedGrabber;
return allowed;
}
@@ -516,8 +527,11 @@ bool QQuickPointerHandler::parentContains(const QPointF &scenePosition) const
{
if (QQuickItem *par = parentItem()) {
if (par->window()) {
+ QRect windowGeometry = par->window()->geometry();
+ if (!par->window()->isTopLevel())
+ windowGeometry = QRect(QWindowPrivate::get(par->window())->globalPosition(), par->window()->size());
QPoint screenPosition = par->window()->mapToGlobal(scenePosition.toPoint());
- if (!par->window()->geometry().contains(screenPosition))
+ if (!windowGeometry.contains(screenPosition))
return false;
}
QPointF p = par->mapFromScene(scenePosition);
diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp
index f8b4d91bda..7d3db1e7c2 100644
--- a/src/quick/items/qquickdroparea.cpp
+++ b/src/quick/items/qquickdroparea.cpp
@@ -91,6 +91,7 @@ QQuickDropAreaPrivate::~QQuickDropAreaPrivate()
/*!
\qmltype DropArea
\instantiates QQuickDropArea
+ \inherits Item
\inqmlmodule QtQuick
\ingroup qtquick-input
\brief For specifying drag and drop handling in an area.
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 464076cbf8..05e50d8e75 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -8178,6 +8178,12 @@ QPointF QQuickItem::mapFromScene(const QPointF &point) const
treated only as a hint. So, the resulting window position may differ from
what is expected.
+ \note If this item is in a subscene, e.g. mapped onto a 3D
+ \l [QtQuick3D QML] {Model}{Model} object, the UV mapping is incorporated
+ into this transformation, so that it really goes from screen coordinates to
+ this item's coordinates, as long as \a point is actually within this item's bounds.
+ The other mapping functions do not yet work that way.
+
\since 5.7
\sa {Concepts - Visual Coordinates in Qt Quick}
@@ -8185,7 +8191,12 @@ QPointF QQuickItem::mapFromScene(const QPointF &point) const
QPointF QQuickItem::mapFromGlobal(const QPointF &point) const
{
Q_D(const QQuickItem);
- return mapFromScene(d->globalToWindowTransform().map(point));
+ QPointF scenePoint = d->globalToWindowTransform().map(point);
+ if (auto da = QQuickDeliveryAgentPrivate::currentOrItemDeliveryAgent(this)) {
+ if (auto sceneTransform = da->sceneTransform())
+ scenePoint = sceneTransform->map(scenePoint);
+ }
+ return mapFromScene(scenePoint);
}
/*!
diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp
index caf5a17dc6..a660bd0ca3 100644
--- a/src/quick/items/qquickrendercontrol.cpp
+++ b/src/quick/items/qquickrendercontrol.cpp
@@ -84,11 +84,15 @@ QT_BEGIN_NAMESPACE
possible in a hardware accelerated manner, unlike the performance-wise limited
alternative of using QQuickWindow::grabWindow()
- When using a QQuickRenderControl, the QQuickWindow does not have to be shown
- or even created at all. This means there will not be an underlying native
- window for it. Instead, the QQuickWindow instance is associated with the
- render control, using the overload of the QQuickWindow constructor, and a
- texture or image object specified via QQuickWindow::setRenderTarget().
+ When using a QQuickRenderControl, the QQuickWindow must not be
+ \l{QWindow::show()}{shown} (it will not be visible on-screen) and there will
+ not be an underlying native window for it. Instead, the QQuickWindow instance
+ is associated with the render control object, using the overload of the
+ QQuickWindow constructor, and a texture or image object specified via
+ QQuickWindow::setRenderTarget(). The QQuickWindow object is still essential,
+ because it represents the Qt Quick scene and provides the bulk of the scene
+ management and event delivery mechanisms. It does not however act as a real
+ on-screen window from the windowing system's perspective.
Management of the graphics devices, contexts, image and texture objects is up
to the application. The device or context that will be used by Qt Quick must
@@ -130,6 +134,12 @@ QT_BEGIN_NAMESPACE
To send events, for example mouse or keyboard events, to the scene, use
QCoreApplication::sendEvent() with the QQuickWindow instance as the receiver.
+ For key events it may be also necessary to set the focus manually on the
+ desired item. In practice this involves calling
+ \l{QQuickItem::forceActiveFocus()}{forceActiveFocus()} on the desired item,
+ for example the scene's root item, once it is associated with the scene (the
+ QQuickWindow).
+
\note In general QQuickRenderControl is supported in combination with all Qt
Quick backends. However, some functionality, in particular grab(), may not be
available in all cases.
diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index 63bedb9734..3f06684f25 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -1105,43 +1105,61 @@ QQuickTableViewPrivate::RebuildOptions QQuickTableViewPrivate::checkForVisibilit
return RebuildOption::None;
}
- // Go through all columns from first to last, find the columns that used
- // to be hidden and not loaded, and check if they should become visible
- // (and vice versa). If there is a change, we need to rebuild.
RebuildOptions rebuildOptions = RebuildOption::None;
- for (int column = leftColumn(); column <= rightColumn(); ++column) {
- const bool wasVisibleFromBefore = loadedColumns.contains(column);
- const bool isVisibleNow = !qFuzzyIsNull(getColumnWidth(column));
- if (wasVisibleFromBefore == isVisibleNow)
- continue;
-
- // A column changed visibility. This means that it should
- // either be loaded or unloaded. So we need a rebuild.
- qCDebug(lcTableViewDelegateLifecycle) << "Column" << column << "changed visibility to" << isVisibleNow;
+ if (loadedTableOuterRect.x() == origin.x() && leftColumn() != 0) {
+ // Since the left column is at the origin of the viewport, but still not the first
+ // column in the model, we need to calculate a new left column since there might be
+ // columns in front of it that used to be hidden, but should now be visible (QTBUG-93264).
rebuildOptions.setFlag(RebuildOption::ViewportOnly);
- if (column == leftColumn()) {
- // The first loaded column should now be hidden. This means that we
- // need to calculate which column should now be first instead.
- rebuildOptions.setFlag(RebuildOption::CalculateNewTopLeftColumn);
+ rebuildOptions.setFlag(RebuildOption::CalculateNewTopLeftColumn);
+ } else {
+ // Go through all loaded columns from first to last, find the columns that used
+ // to be hidden and not loaded, and check if they should become visible
+ // (and vice versa). If there is a change, we need to rebuild.
+ for (int column = leftColumn(); column <= rightColumn(); ++column) {
+ const bool wasVisibleFromBefore = loadedColumns.contains(column);
+ const bool isVisibleNow = !qFuzzyIsNull(getColumnWidth(column));
+ if (wasVisibleFromBefore == isVisibleNow)
+ continue;
+
+ // A column changed visibility. This means that it should
+ // either be loaded or unloaded. So we need a rebuild.
+ qCDebug(lcTableViewDelegateLifecycle) << "Column" << column << "changed visibility to" << isVisibleNow;
+ rebuildOptions.setFlag(RebuildOption::ViewportOnly);
+ if (column == leftColumn()) {
+ // The first loaded column should now be hidden. This means that we
+ // need to calculate which column should now be first instead.
+ rebuildOptions.setFlag(RebuildOption::CalculateNewTopLeftColumn);
+ }
+ break;
}
- break;
}
- // Go through all rows from first to last, and do the same as above
- for (int row = topRow(); row <= bottomRow(); ++row) {
- const bool wasVisibleFromBefore = loadedRows.contains(row);
- const bool isVisibleNow = !qFuzzyIsNull(getRowHeight(row));
- if (wasVisibleFromBefore == isVisibleNow)
- continue;
-
- // A row changed visibility. This means that it should
- // either be loaded or unloaded. So we need a rebuild.
- qCDebug(lcTableViewDelegateLifecycle) << "Row" << row << "changed visibility to" << isVisibleNow;
+ if (loadedTableOuterRect.y() == origin.y() && topRow() != 0) {
+ // Since the top row is at the origin of the viewport, but still not the first
+ // row in the model, we need to calculate a new top row since there might be
+ // rows in front of it that used to be hidden, but should now be visible (QTBUG-93264).
rebuildOptions.setFlag(RebuildOption::ViewportOnly);
- if (row == topRow())
- rebuildOptions.setFlag(RebuildOption::CalculateNewTopLeftRow);
- break;
+ rebuildOptions.setFlag(RebuildOption::CalculateNewTopLeftRow);
+ } else {
+ // Go through all loaded rows from first to last, find the rows that used
+ // to be hidden and not loaded, and check if they should become visible
+ // (and vice versa). If there is a change, we need to rebuild.
+ for (int row = topRow(); row <= bottomRow(); ++row) {
+ const bool wasVisibleFromBefore = loadedRows.contains(row);
+ const bool isVisibleNow = !qFuzzyIsNull(getRowHeight(row));
+ if (wasVisibleFromBefore == isVisibleNow)
+ continue;
+
+ // A row changed visibility. This means that it should
+ // either be loaded or unloaded. So we need a rebuild.
+ qCDebug(lcTableViewDelegateLifecycle) << "Row" << row << "changed visibility to" << isVisibleNow;
+ rebuildOptions.setFlag(RebuildOption::ViewportOnly);
+ if (row == topRow())
+ rebuildOptions.setFlag(RebuildOption::CalculateNewTopLeftRow);
+ break;
+ }
}
return rebuildOptions;
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 10399b4e27..efb10bed48 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -2171,7 +2171,7 @@ void QQuickText::resetMaximumLineCount()
<img src="" align="top,middle,bottom" width="" height=""> - inline images
<ol type="">, <ul type=""> and <li> - ordered and unordered lists
<pre></pre> - preformatted
- &gt; &lt; &amp;
+ &gt; &lt; &amp; &quot; &nbsp; &apos;
\endcode
\c Text.StyledText parser is strict, requiring tags to be correctly nested.
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 0e62898d57..0aee8b2cb1 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -2359,6 +2359,14 @@ void QQuickTextEdit::q_textChanged()
d->determineHorizontalAlignment();
d->updateDefaultTextOption();
updateSize();
+
+ markDirtyNodesForRange(0, d->document->characterCount(), 0);
+ polish();
+ if (isComponentComplete()) {
+ d->updateType = QQuickTextEditPrivate::UpdatePaintNode;
+ update();
+ }
+
emit textChanged();
}
diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp
index dd666416e8..51bf2ca6be 100644
--- a/src/quick/items/qquicktextnodeengine.cpp
+++ b/src/quick/items/qquicktextnodeengine.cpp
@@ -266,11 +266,10 @@ void QQuickTextNodeEngine::processCurrentLine()
Q_ASSERT(sortedIndex < m_currentLineTree.size());
node = m_currentLineTree.data() + sortedIndex;
+ if (i == 0)
+ currentSelectionState = node->selectionState;
}
- if (i == 0)
- currentSelectionState = node->selectionState;
-
// Update decorations
if (currentDecorations != Decoration::NoDecoration) {
decorationRect.setY(m_position.y() + m_currentLine.y());
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 6d602a3810..f143a689a6 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -869,16 +869,16 @@ void QQuickWindowPrivate::cleanup(QSGNode *n)
/*!
\qmltype Window
\instantiates QQuickWindow
- \inqmlmodule QtQuick.Window
+ \inqmlmodule QtQuick
\ingroup qtquick-visual
\brief Creates a new top-level window.
The Window object creates a new top-level window for a Qt Quick scene. It automatically sets up the
- window for use with \c {QtQuick 2.x} graphical types.
+ window for use with \c {QtQuick} graphical types.
To use this type, you will need to import the module with the following line:
\code
- import QtQuick.Window 2.2
+ import QtQuick
\endcode
Omitting this import will allow you to have a QML environment without
@@ -1370,7 +1370,12 @@ bool QQuickWindow::event(QEvent *e)
if (danpit == deliveryAgentsNeedingPoints.end()) {
deliveryAgentsNeedingPoints.insert(ptda, QList<QEventPoint>() << pt);
} else {
- danpit.value().append(pt);
+ auto &ptList = danpit.value();
+ auto ptid = pt.id();
+ auto alreadyThere = std::find_if(ptList.constBegin(), ptList.constEnd(),
+ [ptid] (const QEventPoint &pep) { return pep.id() == ptid; });
+ if (alreadyThere == ptList.constEnd())
+ danpit.value().append(pt);
}
};
@@ -1425,8 +1430,6 @@ bool QQuickWindow::event(QEvent *e)
qCDebug(lcPtr) << daAndPoints.first << "shall now receive" << pe;
ret = daAndPoints.first->event(pe) || ret;
}
- if (pe->isAccepted())
- break;
}
if (ret)
diff --git a/src/quick/scenegraph/qsgdefaultcontext.cpp b/src/quick/scenegraph/qsgdefaultcontext.cpp
index 2df9c50898..fd448ee3a2 100644
--- a/src/quick/scenegraph/qsgdefaultcontext.cpp
+++ b/src/quick/scenegraph/qsgdefaultcontext.cpp
@@ -298,14 +298,11 @@ void *QSGDefaultContext::getResource(QQuickWindow *window, Resource resource) co
QQuickWindowPrivate::get(window)->context);
QSGRhiSupport *rhiSupport = QSGRhiSupport::instance();
- switch (resource) {
#if QT_CONFIG(vulkan)
- case VulkanInstanceResource:
+ if (resource == VulkanInstanceResource)
return window->vulkanInstance();
#endif
- default:
- return const_cast<void *>(rhiSupport->rifResource(resource, rc, window));
- }
+ return const_cast<void *>(rhiSupport->rifResource(resource, rc, window));
}
QSGRendererInterface::ShaderType QSGDefaultContext::shaderType() const
diff --git a/src/quick/util/qquickdeliveryagent.cpp b/src/quick/util/qquickdeliveryagent.cpp
index a38ac410d4..72b532d0a4 100644
--- a/src/quick/util/qquickdeliveryagent.cpp
+++ b/src/quick/util/qquickdeliveryagent.cpp
@@ -626,6 +626,21 @@ void QQuickDeliveryAgentPrivate::updateFocusItemTransform()
}
/*! \internal
+ If called during event delivery, returns the agent that is delivering the
+ event, without checking whether \a item is reachable from there.
+ Otherwise returns QQuickItemPrivate::deliveryAgent() (the delivery agent for
+ the narrowest subscene containing \a item), or \c null if \a item is \c null.
+*/
+QQuickDeliveryAgent *QQuickDeliveryAgentPrivate::currentOrItemDeliveryAgent(const QQuickItem *item)
+{
+ if (currentEventDeliveryAgent)
+ return currentEventDeliveryAgent;
+ if (item)
+ return QQuickItemPrivate::get(const_cast<QQuickItem *>(item))->deliveryAgent();
+ return nullptr;
+}
+
+/*! \internal
QQuickDeliveryAgent delivers events to a tree of Qt Quick Items, beginning
with the given root item, which is usually QQuickWindow::rootItem() but
may alternatively be embedded into a Qt Quick 3D scene or something else.
@@ -650,8 +665,20 @@ QQuickItem *QQuickDeliveryAgent::rootItem() const
}
/*! \internal
+ Returns the object that was set in setSceneTransform(): a functor that
+ transforms from scene coordinates in the parent scene to scene coordinates
+ within this DA's subscene, or \c null if none was set.
+*/
+QQuickDeliveryAgent::Transform *QQuickDeliveryAgent::sceneTransform() const
+{
+ Q_D(const QQuickDeliveryAgent);
+ return d->sceneTransform;
+}
+
+/*! \internal
QQuickDeliveryAgent takes ownership of the given \a transform, which
- encapsulates the ability to transform viewport coordinates to rootItem coordinates.
+ encapsulates the ability to transform parent scene coordinates to rootItem
+ (subscene) coordinates.
*/
void QQuickDeliveryAgent::setSceneTransform(QQuickDeliveryAgent::Transform *transform)
{
@@ -1493,10 +1520,12 @@ void QQuickDeliveryAgentPrivate::onGrabChanged(QObject *grabber, QPointingDevice
void QQuickDeliveryAgentPrivate::ensureDeviceConnected(const QPointingDevice *dev)
{
+ Q_Q(QQuickDeliveryAgent);
if (knownPointingDevices.contains(dev))
return;
knownPointingDevices.append(dev);
connect(dev, &QPointingDevice::grabChanged, this, &QQuickDeliveryAgentPrivate::onGrabChanged);
+ QObject::connect(dev, &QObject::destroyed, q, [this, dev] {this->knownPointingDevices.removeAll(dev);});
}
void QQuickDeliveryAgentPrivate::deliverPointerEvent(QPointerEvent *event)
diff --git a/src/quick/util/qquickdeliveryagent_p.h b/src/quick/util/qquickdeliveryagent_p.h
index 9b73d9b9b9..df8c97b368 100644
--- a/src/quick/util/qquickdeliveryagent_p.h
+++ b/src/quick/util/qquickdeliveryagent_p.h
@@ -81,6 +81,7 @@ public:
QQuickItem *rootItem() const;
+ Transform *sceneTransform() const;
void setSceneTransform(Transform *transform);
bool event(QEvent *ev) override;
diff --git a/src/quick/util/qquickdeliveryagent_p_p.h b/src/quick/util/qquickdeliveryagent_p_p.h
index ad1eece36e..f931cfd70b 100644
--- a/src/quick/util/qquickdeliveryagent_p_p.h
+++ b/src/quick/util/qquickdeliveryagent_p_p.h
@@ -121,6 +121,7 @@ public:
static bool subsceneAgentsExist;
// QQuickDeliveryAgent::event() sets this to the one that's currently (trying to) handle the event
static QQuickDeliveryAgent *currentEventDeliveryAgent;
+ static QQuickDeliveryAgent *currentOrItemDeliveryAgent(const QQuickItem *item);
Qt::FocusReason lastFocusReason = Qt::OtherFocusReason;
int pointerEventRecursionGuard = 0;
diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp
index d967721b64..96f5ce4d57 100644
--- a/src/quick/util/qquickstyledtext.cpp
+++ b/src/quick/util/qquickstyledtext.cpp
@@ -46,6 +46,8 @@
#include "qquickstyledtext_p.h"
#include <QQmlContext>
+Q_LOGGING_CATEGORY(lcStyledText, "qt.quick.styledtext")
+
/*
QQuickStyledText supports few tags:
@@ -562,10 +564,14 @@ void QQuickStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textI
textOut += QChar(60);
else if (entity == QLatin1String("amp"))
textOut += QChar(38);
+ else if (entity == QLatin1String("apos"))
+ textOut += QChar(39);
else if (entity == QLatin1String("quot"))
textOut += QChar(34);
else if (entity == QLatin1String("nbsp"))
textOut += QChar(QChar::Nbsp);
+ else
+ qCWarning(lcStyledText) << "StyledText doesn't support entity" << entity;
return;
} else if (*ch == QLatin1Char(' ')) {
auto entity = QStringView(textIn).mid(entityStart - 1, entityLength + 1);
diff --git a/tests/auto/qml/qmlcachegen/CMakeLists.txt b/tests/auto/qml/qmlcachegen/CMakeLists.txt
index 06a5fb9b9c..d03e277b93 100644
--- a/tests/auto/qml/qmlcachegen/CMakeLists.txt
+++ b/tests/auto/qml/qmlcachegen/CMakeLists.txt
@@ -56,11 +56,8 @@ qt_internal_add_resource(tst_qmlcachegen "trickypaths"
FILES
${trickypaths_resource_files}
)
-set_source_files_properties("data/Retain.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Retain.qml"
-)
set(retain_resource_files
- "Retain.qml"
+ "data/Retain.qml"
)
qt_internal_add_resource(tst_qmlcachegen "retain"
@@ -76,14 +73,12 @@ set_source_files_properties("data/SkipQmlCacheGen.qml"
QT_SKIP_QUICKCOMPILER 1
)
set(skip_resource_files
- "SkipQmlCacheGen.qml"
+ "data/SkipQmlCacheGen.qml"
)
qt_internal_add_resource(tst_qmlcachegen "skip"
PREFIX
"/not/"
- BASE
- "data"
FILES
${skip_resource_files}
)
diff --git a/tests/auto/qml/qqmllanguage/data/variantListConversion.qml b/tests/auto/qml/qqmllanguage/data/variantListConversion.qml
new file mode 100644
index 0000000000..334bf17393
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/variantListConversion.qml
@@ -0,0 +1,7 @@
+import Test
+
+Foo {
+ a.a: 12
+ b.a: 13
+ fooProperty: [a, b]
+}
diff --git a/tests/auto/qml/qqmllanguage/testtypes.cpp b/tests/auto/qml/qqmllanguage/testtypes.cpp
index 80ec4900c7..fd541fd36a 100644
--- a/tests/auto/qml/qqmllanguage/testtypes.cpp
+++ b/tests/auto/qml/qqmllanguage/testtypes.cpp
@@ -122,6 +122,9 @@ void registerTypes()
qmlRegisterTypesAndRevisions<Extended, Foreign, ForeignExtended>("Test", 1);
qmlRegisterTypesAndRevisions<BareSingleton>("Test", 1);
qmlRegisterTypesAndRevisions<UncreatableSingleton>("Test", 1);
+
+ qmlRegisterTypesAndRevisions<Large>("Test", 1);
+ qmlRegisterTypesAndRevisions<Foo>("Test", 1);
}
QVariant myCustomVariantTypeConverter(const QString &data)
diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h
index c3733efd3f..9c122a6e92 100644
--- a/tests/auto/qml/qqmllanguage/testtypes.h
+++ b/tests/auto/qml/qqmllanguage/testtypes.h
@@ -1711,6 +1711,54 @@ signals:
void signal(QJSValue value);
};
+struct Large {
+ Q_GADGET
+ QML_VALUE_TYPE(large)
+
+ Q_PROPERTY(uint a MEMBER a)
+ Q_PROPERTY(uint b MEMBER b)
+ Q_PROPERTY(uint c MEMBER c)
+ Q_PROPERTY(uint d MEMBER d)
+ Q_PROPERTY(uint e MEMBER e)
+ Q_PROPERTY(uint f MEMBER f)
+
+public:
+ quint64 a;
+ quint64 b;
+ quint64 c;
+ quint64 d;
+ quint64 e;
+ quint64 f;
+};
+
+inline bool operator==(const Large &a, const Large &b)
+{
+ return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d && a.e == b.e && a.f == b.f;
+}
+
+inline bool operator!=(const Large &a, const Large &b) { return !(a == b); }
+
+class Foo: public QObject {
+
+ Q_OBJECT
+ Q_PROPERTY(QVariantList fooProperty READ getList WRITE setList)
+ Q_PROPERTY(Large a MEMBER a BINDABLE aBindable)
+ Q_PROPERTY(Large b MEMBER b BINDABLE bBindable)
+ QML_ELEMENT
+
+public:
+ QVariantList getList() const { return mFooProperty;}
+ void setList(QVariantList list) { mFooProperty = list;}
+
+ QBindable<Large> aBindable() { return QBindable<Large>(&a); }
+ QBindable<Large> bBindable() { return QBindable<Large>(&b); }
+
+private:
+ QProperty<Large> a;
+ QProperty<Large> b;
+ QVariantList mFooProperty;
+};
+
void registerTypes();
#endif // TESTTYPES_H
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index b5bc1d72ac..df759ba7d0 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -358,6 +358,8 @@ private slots:
void hangOnWarning();
+ void variantListConversion();
+
private:
QQmlEngine engine;
QStringList defaultImportPathList;
@@ -6288,6 +6290,23 @@ void tst_qqmllanguage::hangOnWarning()
QVERIFY(object != nullptr);
}
+void tst_qqmllanguage::variantListConversion()
+{
+ QQmlEngine engine;
+ QQmlComponent c(&engine, testFileUrl("variantListConversion.qml"));
+ QVERIFY2(c.isReady(), qPrintable(c.errorString()));
+ QScopedPointer<QObject> o(c.create());
+
+ Foo *foo = qobject_cast<Foo *>(o.data());
+ QVERIFY(foo);
+ const QVariantList list = foo->getList();
+ QCOMPARE(list.length(), 2);
+ const Large l0 = qvariant_cast<Large>(list.at(0));
+ QCOMPARE(l0.a, 12ull);
+ const Large l1 = qvariant_cast<Large>(list.at(1));
+ QCOMPARE(l1.a, 13ull);
+}
+
QTEST_MAIN(tst_qqmllanguage)
#include "tst_qqmllanguage.moc"
diff --git a/tests/auto/qml/qqmlmetatype/data/revisionedGroupedPropertiesUnversioned.qml b/tests/auto/qml/qqmlmetatype/data/revisionedGroupedPropertiesUnversioned.qml
new file mode 100644
index 0000000000..cef3ab84e6
--- /dev/null
+++ b/tests/auto/qml/qqmlmetatype/data/revisionedGroupedPropertiesUnversioned.qml
@@ -0,0 +1,5 @@
+import GroupedTest
+
+MyRevisioned {
+ grouped.prop2: 5
+}
diff --git a/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp b/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
index 50d23dd049..0556276280 100644
--- a/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
+++ b/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
@@ -573,6 +573,7 @@ class Grouped : public QObject
{
Q_OBJECT
Q_PROPERTY(int prop READ prop WRITE setProp NOTIFY propChanged REVISION 1)
+ Q_PROPERTY(int prop2 READ prop WRITE setProp NOTIFY prop2Changed REVISION 2)
public:
int prop() const { return m_prop; }
void setProp(int prop)
@@ -580,11 +581,13 @@ public:
if (prop != m_prop) {
m_prop = prop;
emit propChanged(prop);
+ emit prop2Changed(prop);
}
}
signals:
Q_REVISION(1) void propChanged(int prop);
+ Q_REVISION(2) void prop2Changed(int prop);
private:
int m_prop = 0;
@@ -602,13 +605,24 @@ private:
QScopedPointer<Grouped> m_grouped;
};
+class MyRevisioned : public MyItem
+{
+ Q_OBJECT
+ Q_PROPERTY(int revisioned READ revisioned CONSTANT REVISION 1)
+public:
+ int revisioned() const { return 12; }
+};
+
void tst_qqmlmetatype::revisionedGroupedProperties()
{
qmlClearTypeRegistrations();
qmlRegisterType<MyItem>("GroupedTest", 1, 0, "MyItem");
qmlRegisterType<MyItem, 1>("GroupedTest", 1, 1, "MyItem");
+ qmlRegisterType<MyRevisioned>("GroupedTest", 1, 0, "MyRevisioned");
+ qmlRegisterType<MyRevisioned, 1>("GroupedTest", 1, 1, "MyRevisioned");
qmlRegisterUncreatableType<Grouped>("GroupedTest", 1, 0, "Grouped", "Grouped");
qmlRegisterUncreatableType<Grouped, 1>("GroupedTest", 1, 1, "Grouped", "Grouped");
+ qmlRegisterUncreatableType<Grouped, 2>("GroupedTest", 1, 2, "Grouped", "Grouped");
{
QQmlEngine engine;
@@ -623,6 +637,15 @@ void tst_qqmlmetatype::revisionedGroupedProperties()
QQmlComponent invalid(&engine, testFileUrl("revisionedGroupedPropertiesInvalid.qml"));
QVERIFY(invalid.isError());
}
+
+ {
+ QQmlEngine engine;
+ QQmlComponent unversioned(
+ &engine, testFileUrl("revisionedGroupedPropertiesUnversioned.qml"));
+ QVERIFY2(unversioned.isReady(), qPrintable(unversioned.errorString()));
+ QScopedPointer<QObject> obj(unversioned.create());
+ QVERIFY(!obj.isNull());
+ }
}
void tst_qqmlmetatype::enumsInRecursiveImport_data()
diff --git a/tests/auto/qml/qqmltranslation/CMakeLists.txt b/tests/auto/qml/qqmltranslation/CMakeLists.txt
index 6e67a2ecfb..cb402b3e64 100644
--- a/tests/auto/qml/qqmltranslation/CMakeLists.txt
+++ b/tests/auto/qml/qqmltranslation/CMakeLists.txt
@@ -27,8 +27,8 @@ qt_internal_add_test(tst_qqmltranslation
# Resources:
set(translation_resource_files
- "qml_fr.qm"
- "translation.qml"
+ "data/qml_fr.qm"
+ "data/translation.qml"
)
# special case begin
@@ -36,12 +36,6 @@ set_source_files_properties(
data/translation.qml
PROPERTIES
QT_SKIP_QUICKCOMPILER 1
- QT_RESOURCE_ALIAS translation.qml
-)
-set_source_files_properties(
- data/qml_fr.qm
- PROPERTIES
- QT_RESOURCE_ALIAS qml_fr.qm
)
# special case end
diff --git a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
index 9c44abd939..58aa6e95f1 100644
--- a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
+++ b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
@@ -24,12 +24,9 @@ qt_internal_add_test(tst_qquickfolderlistmodel
TESTDATA ${test_data}
)
-# special case begin
-set_source_files_properties(data/txtdir/hello.txt PROPERTIES QT_RESOURCE_ALIAS "txtdir/hello.txt")
-# special case end
# Resources:
set(introspect_resource_files
- "txtdir/hello.txt"
+ "data/txtdir/hello.txt"
)
qt_internal_add_resource(tst_qquickfolderlistmodel "introspect"
diff --git a/tests/auto/qmltest/CMakeLists.txt b/tests/auto/qmltest/CMakeLists.txt
index fe402859a4..33f7c004c8 100644
--- a/tests/auto/qmltest/CMakeLists.txt
+++ b/tests/auto/qmltest/CMakeLists.txt
@@ -16,7 +16,6 @@ add_subdirectory(listmodel)
add_subdirectory(listview)
add_subdirectory(objectmodel)
add_subdirectory(pathview)
-add_subdirectory(pixel)
add_subdirectory(positioners)
add_subdirectory(qqmlbinding)
add_subdirectory(qtbug46798)
diff --git a/tests/auto/qmltest/pixel/CMakeLists.txt b/tests/auto/qmltest/pixel/CMakeLists.txt
deleted file mode 100644
index 8ba8a1b2d3..0000000000
--- a/tests/auto/qmltest/pixel/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Generated from pixel.pro.
-
-#####################################################################
-## pixel Test:
-#####################################################################
-
-qt_internal_add_test(pixel
- GUI
- QMLTEST
- PUBLIC_LIBRARIES
- Qt::Gui
-)
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/dragAndWheel.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/dragAndWheel.qml
new file mode 100644
index 0000000000..811326aaba
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/dragAndWheel.qml
@@ -0,0 +1,32 @@
+import QtQuick 2.15
+
+Item {
+ id: root
+
+ property bool gotWheel: false
+ property int changeCount: 0
+ property alias wheelHandlerEnabled: wheelHandler.enabled
+
+ width: 640
+ height: 480
+
+ Rectangle {
+ color: "blue"
+ width: 200
+ height: 200
+
+ DragHandler {
+ id: dragHandler
+ }
+
+ WheelHandler {
+ id: wheelHandler
+
+ enabled: !dragHandler.active
+ onEnabledChanged: root.changeCount++
+ onWheel: root.gotWheel = true
+ }
+
+ }
+
+}
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/dragHandlerUnderModalLayer.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/dragHandlerUnderModalLayer.qml
new file mode 100644
index 0000000000..b24812c914
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/dragHandlerUnderModalLayer.qml
@@ -0,0 +1,34 @@
+import QtQuick 2.15
+
+import Test 1.0
+
+Item {
+ width: 640
+ height: 480
+
+ Rectangle {
+ anchors.fill: parent
+ color: "grey"
+
+ Rectangle {
+ x: 200
+ y: 200
+ width: 100
+ height: 100
+ color: "orange"
+ DragHandler {
+ grabPermissions: DragHandler.CanTakeOverFromAnything // but not anything with keepMouseGrab!
+ }
+ }
+ }
+
+ ModalLayer {
+ anchors.fill: parent
+
+ Rectangle {
+ anchors.fill: parent
+ color: "red"
+ opacity: 0.4
+ }
+ }
+}
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp b/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp
index 9c9ca2fe00..2cb26124ae 100644
--- a/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp
@@ -69,8 +69,11 @@ private slots:
void touchPassiveGrabbers_data();
void touchPassiveGrabbers();
void touchPinchAndMouseMove();
+ void unsuitableEventDuringDrag();
+ void underModalLayer();
private:
+ void sendWheelEvent(QQuickView &window, QPoint pos, QPoint angleDelta, QPoint pixelDelta, Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase, bool inverted);
void createView(QScopedPointer<QQuickView> &window, const char *fileName);
QSet<QQuickPointerHandler *> passiveGrabbers(QQuickWindow *window, int pointId = 0);
QPointingDevice *touchDevice;
@@ -821,6 +824,130 @@ void tst_DragHandler::touchPinchAndMouseMove()
}
}
+void tst_DragHandler::unsuitableEventDuringDrag()
+{
+ QScopedPointer<QQuickView> windowPtr;
+ createView(windowPtr, "dragAndWheel.qml");
+ QQuickView *window = windowPtr.data();
+ auto root = window->rootObject();
+ QQmlProperty changeCount(root, "changeCount");
+ QQmlProperty wheelHandlerEnabled(root, "wheelHandlerEnabled");
+ bool ok = false;
+ QCOMPARE(changeCount.read().toInt(&ok), 0);
+ QVERIFY(ok);
+ QCOMPARE(wheelHandlerEnabled.read().toBool(), true);
+
+ QPoint p1(100, 100);
+ QPoint p2(150, 150);
+
+ QTest::QTouchEventSequence touch = QTest::touchEvent(window, touchDevice);
+ // When we start dragging...
+ touch.press(3,p1).commit();
+ touch.move(3, p2).commit();
+ QQuickTouchUtils::flush(window);
+ // the DragHandler becomes active
+ ok = false;
+ QCOMPARE(changeCount.read().toInt(&ok), 1);
+ QVERIFY(ok);
+ QCOMPARE(wheelHandlerEnabled.read().toBool(), false);
+
+ // When a scroll event arrives while we are dragging
+ sendWheelEvent(*window, p2, QPoint(160, 120), QPoint(-360, 120), Qt::NoModifier, Qt::ScrollBegin, false);
+ // nothing changes because the DragHandler is still active, and the wheel handler stays disabled
+ ok = false;
+ QCOMPARE(changeCount.read().toInt(&ok), 1);
+ QVERIFY(ok);
+ QCOMPARE(wheelHandlerEnabled.read().toBool(), false);
+
+ // When we stop dragging...
+ touch.release(3, p2).commit();
+ QQuickTouchUtils::flush(window);
+
+ // the wheel handler becomes active again
+ ok = false;
+ QCOMPARE(changeCount.read().toInt(&ok), 2);
+ QVERIFY(ok);
+ QCOMPARE(wheelHandlerEnabled.read().toBool(), true);
+
+ // During the whole sequence the wheel handler never got a wheel event
+ // as it was disabled:
+ QQmlProperty gotWheel(root, "gotWheel");
+ QVERIFY(!gotWheel.read().toBool());
+
+ // If the WheelHandler is unconditionally enabled...
+ wheelHandlerEnabled.write(true);
+ // it receives scroll events during drags.
+ touch.press(4,p2).commit();
+ touch.move(4, p1).commit();
+ QQuickTouchUtils::flush(window);
+ sendWheelEvent(*window, p2, QPoint(160, 120), QPoint(-360, 120), Qt::NoModifier, Qt::ScrollBegin, false);
+ touch.release(4, p2).commit();
+ QQuickTouchUtils::flush(window);
+ QVERIFY(gotWheel.read().toBool());
+}
+
+void tst_DragHandler::sendWheelEvent(QQuickView &window, QPoint pos, QPoint angleDelta, QPoint pixelDelta, Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase, bool inverted)
+{
+ QWheelEvent wheelEvent(pos, window.mapToGlobal(pos), pixelDelta, angleDelta,
+ Qt::NoButton, modifiers, phase, inverted);
+ QGuiApplication::sendEvent(&window, &wheelEvent);
+ qApp->processEvents();
+ QQuickTouchUtils::flush(&window);
+}
+
+class ModalLayer : public QQuickItem {
+public:
+ explicit ModalLayer(QQuickItem* parent = nullptr) : QQuickItem(parent) {
+ this->setAcceptedMouseButtons(Qt::AllButtons);
+ this->setAcceptTouchEvents(true);
+ this->setKeepMouseGrab(true);
+ this->setKeepTouchGrab(true);
+ }
+
+ bool event(QEvent* event) override {
+ switch (event->type()) {
+ case QEvent::KeyPress:
+ case QEvent::MouseMove:
+ case QEvent::MouseButtonPress:
+ case QEvent::MouseButtonRelease:
+ case QEvent::MouseTrackingChange:
+ case QEvent::MouseButtonDblClick:
+ case QEvent::Wheel:
+ case QEvent::TouchBegin:
+ case QEvent::TouchUpdate:
+ case QEvent::TouchCancel:
+ case QEvent::TouchEnd: {
+ qCDebug(lcPointerTests) << "BLOCK!" << event->type();
+ return true;
+ }
+ default: break;
+ }
+ return QQuickItem::event(event);
+ }
+};
+
+void tst_DragHandler::underModalLayer() // QTBUG-78258
+{
+ qmlRegisterType<ModalLayer>("Test", 1, 0, "ModalLayer");
+
+ const int dragThreshold = QGuiApplication::styleHints()->startDragDistance();
+ QScopedPointer<QQuickView> windowPtr;
+ createView(windowPtr, "dragHandlerUnderModalLayer.qml");
+ QQuickView * window = windowPtr.data();
+ QPointer<QQuickDragHandler> dragHandler = window->rootObject()->findChild<QQuickDragHandler*>();
+ QVERIFY(dragHandler);
+
+ QPoint p1(250, 250);
+ QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, p1);
+ p1 += QPoint(dragThreshold, dragThreshold);
+ QTest::mouseMove(window, p1);
+ QVERIFY(!dragHandler->active());
+ p1 += QPoint(dragThreshold, dragThreshold);
+ QTest::mouseMove(window, p1);
+ QVERIFY(!dragHandler->active());
+ QTest::mouseRelease(window, Qt::LeftButton);
+}
+
QTEST_MAIN(tst_DragHandler)
#include "tst_qquickdraghandler.moc"
diff --git a/tests/auto/quick/pointerhandlers/qquickpinchhandler/tst_qquickpinchhandler.cpp b/tests/auto/quick/pointerhandlers/qquickpinchhandler/tst_qquickpinchhandler.cpp
index 6df672e4e8..0d29ae6516 100644
--- a/tests/auto/quick/pointerhandlers/qquickpinchhandler/tst_qquickpinchhandler.cpp
+++ b/tests/auto/quick/pointerhandlers/qquickpinchhandler/tst_qquickpinchhandler.cpp
@@ -211,6 +211,7 @@ void tst_QQuickPinchHandler::scale()
QQuickPinchHandler *pinchHandler = window->rootObject()->findChild<QQuickPinchHandler*>("pinchHandler");
QVERIFY(pinchHandler != nullptr);
+ QSignalSpy grabChangedSpy(pinchHandler, SIGNAL(grabChanged(QPointingDevice::GrabTransition, QEventPoint)));
QQuickItem *root = qobject_cast<QQuickItem*>(window->rootObject());
QVERIFY(root != nullptr);
@@ -232,6 +233,7 @@ void tst_QQuickPinchHandler::scale()
// it is outside its bounds.
pinchSequence.stationary(0).press(1, p1, window).commit();
QQuickTouchUtils::flush(window);
+ QTRY_COMPARE(grabChangedSpy.count(), 1); // passive grab
QPoint pd(10, 10);
// move one point until PinchHandler activates
@@ -241,6 +243,8 @@ void tst_QQuickPinchHandler::scale()
QQuickTouchUtils::flush(window);
}
QCOMPARE(pinchHandler->active(), true);
+ // first point got a passive grab; both points got exclusive grabs
+ QCOMPARE(grabChangedSpy.count(), 3);
QLineF line(p0, p1);
const qreal startLength = line.length();
diff --git a/tests/auto/qmltest/pixel/tst_pixel.qml b/tests/auto/quick/pointerhandlers/qquicktaphandler/data/simpleTapHandler.qml
index e628fed1d8..1c18133f92 100644
--- a/tests/auto/qmltest/pixel/tst_pixel.qml
+++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/data/simpleTapHandler.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
@@ -26,40 +26,14 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtTest 1.1
-
-Rectangle {
- id:rect
- width: 40
- height: 40
- color:"red"
- TestCase {
- name: "Pixels"
- when: windowShown
-
- function test_pixel() {
- skip("test_pixel() is unstable, QTBUG-27671")
- var img = grabImage(rect);
- compare(img.pixel(20, 20), Qt.rgba(255, 0, 0, 255));
- compare(img.red(1,1), 255);
- compare(img.green(1,1), 0);
- compare(img.blue(1,1), 0);
- compare(img.alpha(1,1), 255);
-
- fuzzyCompare(img.red(1,1), 254, 2);
- fuzzyCompare(img.pixel(1,1), Qt.rgba(254, 0, 0, 254), 2);
- fuzzyCompare(img.pixel(1,1), "#FF0201", 2);
-
- rect.color = "blue";
- waitForRendering(rect);
- img = grabImage(rect);
- compare(img.pixel(20, 20), Qt.rgba(0, 0, 255, 255));
- compare(img.red(1,1), 0);
- compare(img.green(1,1), 0);
- compare(img.blue(1,1), 255);
- compare(img.alpha(1,1), 255);
- }
+import QtQuick 2.12
+Item {
+ id: root
+ width: 100
+ height: 100
+ property int tapCount: 0
+ TapHandler {
+ onTapped: { ++root.tapCount }
}
-} \ No newline at end of file
+}
diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp b/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp
index 7e7441685f..5fb905cbab 100644
--- a/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp
+++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp
@@ -71,15 +71,25 @@ private slots:
void componentUserBehavioralOverride();
void rightLongPressIgnoreWheel();
void negativeZStackingOrder();
+ void nonTopLevelParentWindow();
private:
- void createView(QScopedPointer<QQuickView> &window, const char *fileName);
+ void createView(QScopedPointer<QQuickView> &window, const char *fileName,
+ QWindow *parent = nullptr);
QPointingDevice *touchDevice = QTest::createTouchDevice();
+ void mouseEvent(QEvent::Type type, Qt::MouseButton button, const QPoint &point,
+ QWindow *targetWindow, QWindow *mapToWindow);
};
-void tst_TapHandler::createView(QScopedPointer<QQuickView> &window, const char *fileName)
+void tst_TapHandler::createView(QScopedPointer<QQuickView> &window, const char *fileName,
+ QWindow *parent)
{
- window.reset(new QQuickView);
+ window.reset(new QQuickView(parent));
+ if (parent) {
+ parent->show();
+ QVERIFY(QTest::qWaitForWindowActive(parent));
+ }
+
window->setSource(testFileUrl(fileName));
QTRY_COMPARE(window->status(), QQuickView::Ready);
QQuickViewTestUtil::centerOnScreen(window.data());
@@ -90,6 +100,20 @@ void tst_TapHandler::createView(QScopedPointer<QQuickView> &window, const char *
QVERIFY(window->rootObject() != nullptr);
}
+void tst_TapHandler::mouseEvent(QEvent::Type type, Qt::MouseButton button, const QPoint &point,
+ QWindow *targetWindow, QWindow *mapToWindow)
+{
+ QVERIFY(targetWindow);
+ QVERIFY(mapToWindow);
+ auto buttons = button;
+ if (type == QEvent::MouseButtonRelease) {
+ buttons = Qt::NoButton;
+ }
+ QMouseEvent me(type, point, mapToWindow->mapToGlobal(point), button, buttons,
+ Qt::KeyboardModifiers(), QPointingDevice::primaryPointingDevice());
+ QVERIFY(qApp->notify(targetWindow, &me));
+}
+
void tst_TapHandler::initTestCase()
{
// This test assumes that we don't get synthesized mouse events from QGuiApplication
@@ -777,6 +801,31 @@ void tst_TapHandler::negativeZStackingOrder() // QTBUG-83114
QVERIFY(order.at(1) == "childTapHandler");
}
+void tst_TapHandler::nonTopLevelParentWindow() // QTBUG-91716
+{
+ QScopedPointer<QQuickWindow> parentWindowPtr(new QQuickWindow);
+ auto parentWindow = parentWindowPtr.get();
+ parentWindow->setGeometry(400, 400, 250, 250);
+
+ QScopedPointer<QQuickView> windowPtr;
+ createView(windowPtr, "simpleTapHandler.qml", parentWindow);
+ auto window = windowPtr.get();
+ window->setGeometry(10, 10, 100, 100);
+
+ QQuickItem *root = window->rootObject();
+
+ auto p1 = QPoint(20, 20);
+ mouseEvent(QEvent::MouseButtonPress, Qt::LeftButton, p1, window, parentWindow);
+ mouseEvent(QEvent::MouseButtonRelease, Qt::LeftButton, p1, window, parentWindow);
+
+ QCOMPARE(root->property("tapCount").toInt(), 1);
+
+ QTest::touchEvent(window, touchDevice).press(0, p1, parentWindow).commit();
+ QTest::touchEvent(window, touchDevice).release(0, p1, parentWindow).commit();
+
+ QCOMPARE(root->property("tapCount").toInt(), 2);
+}
+
QTEST_MAIN(tst_TapHandler)
#include "tst_qquicktaphandler.moc"
diff --git a/tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp b/tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp
index 6165e0ee93..18d6b6b5a7 100644
--- a/tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp
+++ b/tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp
@@ -129,6 +129,9 @@ static void removeObjectFromList(const QQmlProperty &property, QObject *objectTo
void tst_qquickdesignersupport::customData()
{
+#ifdef Q_CC_MINGW
+ QSKIP("QQuickDesignerSupportProperties::registerCustomData segfaults on mingw. QTBUG-90869");
+#endif
QScopedPointer<QQuickView> view(new QQuickView);
view->engine()->setOutputWarningsToStandardError(false);
view->setSource(testFileUrl("test.qml"));
@@ -185,6 +188,9 @@ void tst_qquickdesignersupport::customData()
void tst_qquickdesignersupport::customDataBindings()
{
+#ifdef Q_CC_MINGW
+ QSKIP("QQuickDesignerSupportProperties::registerCustomData segfaults on mingw. QTBUG-90869");
+#endif
QScopedPointer<QQuickView> view(new QQuickView);
view->engine()->setOutputWarningsToStandardError(false);
view->setSource(testFileUrl("test.qml"));
@@ -666,6 +672,9 @@ void tst_qquickdesignersupport::testSimpleBindings()
{
if (QTestPrivate::isRunningArmOnX86())
QSKIP("Crashes in QEMU. (QTBUG-90869)");
+#ifdef Q_CC_MINGW
+ QSKIP("QQuickDesignerSupportProperties::registerCustomData segfaults on mingw. QTBUG-90869");
+#endif
QScopedPointer<QQuickView> view(new QQuickView);
view->engine()->setOutputWarningsToStandardError(false);
@@ -710,6 +719,9 @@ void tst_qquickdesignersupport::testDotProperties()
{
if (QTestPrivate::isRunningArmOnX86())
QSKIP("Crashes in QEMU. (QTBUG-90869)");
+#ifdef Q_CC_MINGW
+ QSKIP("QQuickDesignerSupportProperties::registerCustomData segfaults on mingw. QTBUG-90869");
+#endif
QScopedPointer<QQuickView> view(new QQuickView);
view->engine()->setOutputWarningsToStandardError(false);
@@ -742,6 +754,9 @@ void tst_qquickdesignersupport::testItemReparenting()
{
if (QTestPrivate::isRunningArmOnX86())
QSKIP("Crashes in QEMU. (QTBUG-90869)");
+#ifdef Q_CC_MINGW
+ QSKIP("QQuickDesignerSupportProperties::registerCustomData segfaults on mingw. QTBUG-90869");
+#endif
QScopedPointer<QQuickView> view(new QQuickView);
view->engine()->setOutputWarningsToStandardError(false);
diff --git a/tests/auto/quick/qquickgridview/BLACKLIST b/tests/auto/quick/qquickgridview/BLACKLIST
index e7bef365e4..741eb2c7dc 100644
--- a/tests/auto/quick/qquickgridview/BLACKLIST
+++ b/tests/auto/quick/qquickgridview/BLACKLIST
@@ -1,5 +1,7 @@
[snapOneRow]
macos # QTBUG-86729
msvc-2019
+windows-10 gcc developer-build
[snapToRow]
msvc-2019
+windows-10 gcc developer-build
diff --git a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
index 005aae0639..60ba28ec08 100644
--- a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
+++ b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
@@ -169,6 +169,8 @@ private slots:
void checkTableviewInsideAsyncLoader();
void hideRowsAndColumns_data();
void hideRowsAndColumns();
+ void hideAndShowFirstColumn();
+ void hideAndShowFirstRow();
void checkThatRevisionedPropertiesCannotBeUsedInOldImports();
void checkSyncView_rootView_data();
void checkSyncView_rootView();
@@ -2423,6 +2425,82 @@ void tst_QQuickTableView::hideRowsAndColumns()
QVERIFY(!columnsToHideList.contains(column));
}
+void tst_QQuickTableView::hideAndShowFirstColumn()
+{
+ // Check that if we hide the first column, it will move
+ // the second column to the origin of the viewport. Then check
+ // that if we show the first column again, it will reappear at
+ // the origin of the viewport, and as such, pushing the second
+ // column to the right of it.
+ LOAD_TABLEVIEW("hiderowsandcolumns.qml");
+
+ const int modelSize = 5;
+ auto model = TestModelAsVariant(modelSize, modelSize);
+ tableView->setModel(model);
+
+ // Start by making the first column hidden
+ const auto columnsToHideList = QList<int>() << 0;
+ view->rootObject()->setProperty("columnsToHide", QVariant::fromValue(columnsToHideList));
+
+ WAIT_UNTIL_POLISHED;
+
+ const int expectedColumnCount = modelSize - columnsToHideList.count();
+ QCOMPARE(tableViewPrivate->loadedColumns.count(), expectedColumnCount);
+ QCOMPARE(tableViewPrivate->leftColumn(), 1);
+ QCOMPARE(tableView->contentX(), 0);
+ QCOMPARE(tableViewPrivate->loadedTableOuterRect.x(), 0);
+
+ // Make the first column in the model visible again
+ const auto emptyList = QList<int>();
+ view->rootObject()->setProperty("columnsToHide", QVariant::fromValue(emptyList));
+ tableView->forceLayout();
+
+ WAIT_UNTIL_POLISHED;
+
+ QCOMPARE(tableViewPrivate->loadedColumns.count(), modelSize);
+ QCOMPARE(tableViewPrivate->leftColumn(), 0);
+ QCOMPARE(tableView->contentX(), 0);
+ QCOMPARE(tableViewPrivate->loadedTableOuterRect.x(), 0);
+}
+
+void tst_QQuickTableView::hideAndShowFirstRow()
+{
+ // Check that if we hide the first row, it will move
+ // the second row to the origin of the viewport. Then check
+ // that if we show the first row again, it will reappear at
+ // the origin of the viewport, and as such, pushing the second
+ // row below it.
+ LOAD_TABLEVIEW("hiderowsandcolumns.qml");
+
+ const int modelSize = 5;
+ auto model = TestModelAsVariant(modelSize, modelSize);
+ tableView->setModel(model);
+
+ // Start by making the first row hidden
+ const auto rowsToHideList = QList<int>() << 0;
+ view->rootObject()->setProperty("rowsToHide", QVariant::fromValue(rowsToHideList));
+
+ WAIT_UNTIL_POLISHED;
+
+ const int expectedRowsCount = modelSize - rowsToHideList.count();
+ QCOMPARE(tableViewPrivate->loadedRows.count(), expectedRowsCount);
+ QCOMPARE(tableViewPrivate->topRow(), 1);
+ QCOMPARE(tableView->contentY(), 0);
+ QCOMPARE(tableViewPrivate->loadedTableOuterRect.y(), 0);
+
+ // Make the first row in the model visible again
+ const auto emptyList = QList<int>();
+ view->rootObject()->setProperty("rowsToHide", QVariant::fromValue(emptyList));
+ tableView->forceLayout();
+
+ WAIT_UNTIL_POLISHED;
+
+ QCOMPARE(tableViewPrivate->loadedRows.count(), modelSize);
+ QCOMPARE(tableViewPrivate->topRow(), 0);
+ QCOMPARE(tableView->contentY(), 0);
+ QCOMPARE(tableViewPrivate->loadedTableOuterRect.y(), 0);
+}
+
void tst_QQuickTableView::checkThatRevisionedPropertiesCannotBeUsedInOldImports()
{
// Check that if you use a QQmlAdaptorModel together with a Repeater, the
diff --git a/tests/manual/mousearea/CMakeLists.txt b/tests/manual/mousearea/CMakeLists.txt
index 8b1a56018b..98f1feee3b 100644
--- a/tests/manual/mousearea/CMakeLists.txt
+++ b/tests/manual/mousearea/CMakeLists.txt
@@ -26,51 +26,18 @@ qt_internal_add_resource(mousearea "qml"
FILES
${qml_resource_files}
)
-set_source_files_properties("../../../examples/quick/shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../../../examples/quick/shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../../../examples/quick/shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
set(quick_shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/slider_handle.png"
+ "../../../examples/quick/shared/Button.qml"
+ "../../../examples/quick/shared/CheckBox.qml"
+ "../../../examples/quick/shared/Label.qml"
+ "../../../examples/quick/shared/LauncherList.qml"
+ "../../../examples/quick/shared/SimpleLauncherDelegate.qml"
+ "../../../examples/quick/shared/Slider.qml"
+ "../../../examples/quick/shared/TextField.qml"
+ "../../../examples/quick/shared/images/back.png"
+ "../../../examples/quick/shared/images/checkmark.png"
+ "../../../examples/quick/shared/images/next.png"
+ "../../../examples/quick/shared/images/slider_handle.png"
)
qt_internal_add_resource(mousearea "quick_shared"
diff --git a/tests/manual/pointer/CMakeLists.txt b/tests/manual/pointer/CMakeLists.txt
index aa3af125dc..d20310aaa8 100644
--- a/tests/manual/pointer/CMakeLists.txt
+++ b/tests/manual/pointer/CMakeLists.txt
@@ -75,51 +75,18 @@ qt_internal_add_resource(pointer "qml"
FILES
${qml_resource_files}
)
-set_source_files_properties("../../../examples/quick/shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../../../examples/quick/shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../../../examples/quick/shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
set(quick_shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/slider_handle.png"
+ "../../../examples/quick/shared/Button.qml"
+ "../../../examples/quick/shared/CheckBox.qml"
+ "../../../examples/quick/shared/Label.qml"
+ "../../../examples/quick/shared/LauncherList.qml"
+ "../../../examples/quick/shared/SimpleLauncherDelegate.qml"
+ "../../../examples/quick/shared/Slider.qml"
+ "../../../examples/quick/shared/TextField.qml"
+ "../../../examples/quick/shared/images/back.png"
+ "../../../examples/quick/shared/images/checkmark.png"
+ "../../../examples/quick/shared/images/next.png"
+ "../../../examples/quick/shared/images/slider_handle.png"
)
qt_internal_add_resource(pointer "quick_shared"
diff --git a/tests/manual/pointer/pinchHandler.qml b/tests/manual/pointer/pinchHandler.qml
index 46ab91c2ed..93169da60a 100644
--- a/tests/manual/pointer/pinchHandler.qml
+++ b/tests/manual/pointer/pinchHandler.qml
@@ -154,6 +154,14 @@ Rectangle {
if (!active)
anim.restart(centroid.velocity)
}
+ onGrabChanged: function (transition, point) {
+ if (transition === 0x10) { // GrabExclusive
+ console.log(point.id, "grabbed @", point.position)
+ Qt.createQmlObject("import QtQuick 2.0; Rectangle { opacity: 0.5; border.color: 'red'; radius: 8; width: radius * 2; height: radius * 2; " +
+ "x: " + (point.position.x - 8) + "; y: " + (point.position.y - 8) + "}",
+ rect3, "touchpoint" + point.id);
+ }
+ }
}
TapHandler { gesturePolicy: TapHandler.DragThreshold; onTapped: rect3.z = rect2.z + 1 }
MomentumAnimation { id: anim; target: rect3 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/activity/activity.qml b/tests/manual/scenegraph_lancelot/data/shaders/activity/activity.qml
index 956b3d7d91..0a0f956af1 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/activity/activity.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/activity/activity.qml
@@ -23,6 +23,6 @@ Item {
property variant source: source
- fragmentShader: "qrc:shaders/gradient.frag"
+ fragmentShader: "qrc:shaders/gradient.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/atlas/atlas.qml b/tests/manual/scenegraph_lancelot/data/shaders/atlas/atlas.qml
index 06c254253e..67e9dafff3 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/atlas/atlas.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/atlas/atlas.qml
@@ -22,7 +22,7 @@ Item {
width: img.width
height: img.height
property variant source: img
- fragmentShader: "qrc:shaders/gradientgrid.frag"
+ fragmentShader: "qrc:shaders/gradientgrid.frag.qsb"
supportsAtlasTextures: false
}
@@ -31,7 +31,7 @@ Item {
width: img.width
height: img.height
property variant source: img
- fragmentShader: "qrc:shaders/gradientgrid.frag"
+ fragmentShader: "qrc:shaders/gradientgrid.frag.qsb"
supportsAtlasTextures: true
}
@@ -41,8 +41,8 @@ Item {
width: img.width
height: img.height
property variant source: img
- fragmentShader: "qrc:shaders/gradientgrid.frag"
- vertexShader: "qrc:shaders/subrect.vert"
+ fragmentShader: "qrc:shaders/gradientgrid.frag.qsb"
+ vertexShader: "qrc:shaders/subrect.vert.qsb"
supportsAtlasTextures: false
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/basic/basic.qml b/tests/manual/scenegraph_lancelot/data/shaders/basic/basic.qml
index 24aa5db5e8..e0026c1412 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/basic/basic.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/basic/basic.qml
@@ -6,6 +6,6 @@ Item {
ShaderEffect {
anchors.fill: parent;
- fragmentShader: "qrc:shaders/basic.frag"
+ fragmentShader: "qrc:shaders/basic.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/basic/basic_alpha.qml b/tests/manual/scenegraph_lancelot/data/shaders/basic/basic_alpha.qml
index 1bd7d0903b..76db704806 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/basic/basic_alpha.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/basic/basic_alpha.qml
@@ -17,7 +17,7 @@ Item {
y: 10
width: 300
height: 200
- fragmentShader: "qrc:shaders/basic_alpha.frag"
+ fragmentShader: "qrc:shaders/basic_alpha.frag.qsb"
blending: true
}
@@ -26,7 +26,7 @@ Item {
y: 250
width: 300
height: 200
- fragmentShader: "qrc:shaders/basic_alpha.frag"
+ fragmentShader: "qrc:shaders/basic_alpha.frag.qsb"
blending: false
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_1.qml
index 118de56098..f60c5f7aa8 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_1.qml
@@ -72,7 +72,7 @@ Rectangle {
cullMode: model.bar
property variant frontSource: front
property variant backSource: back
- fragmentShader: "qrc:shaders/culling.frag"
+ fragmentShader: "qrc:shaders/culling.frag.qsb"
transform: Rotation {
origin.x: 200
origin.y: 180 - 120 * index
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml
index 7614451e05..43254dd044 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml
@@ -72,7 +72,7 @@ Rectangle {
cullMode: model.bar
property variant frontSource: front
property variant backSource: back
- fragmentShader: "qrc:shaders/culling.frag"
+ fragmentShader: "qrc:shaders/culling.frag.qsb"
transform: Rotation {
origin.x: 100
origin.y: 180 - 120 * index
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml
index 7a743453ab..8546a4bb0b 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml
@@ -40,7 +40,7 @@ Rectangle {
}
smooth: true
}
- vertexShader: "qrc:shaders/wave.vert"
+ vertexShader: "qrc:shaders/wave.vert.qsb"
mesh: GridMesh {
property int r: 1
resolution: Qt.size(r, r)
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_16.qml b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_16.qml
index 9e221d0887..2d92c4a025 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_16.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_16.qml
@@ -40,7 +40,7 @@ Rectangle {
}
smooth: true
}
- vertexShader: "qrc:shaders/wave.vert"
+ vertexShader: "qrc:shaders/wave.vert.qsb"
mesh: GridMesh {
property int r: 16
resolution: Qt.size(r, r)
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_2.qml
index 4dad42d182..24ba2b6650 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_2.qml
@@ -40,7 +40,7 @@ Rectangle {
}
smooth: true
}
- vertexShader: "qrc:shaders/wave.vert"
+ vertexShader: "qrc:shaders/wave.vert.qsb"
mesh: GridMesh {
property int r: 2
resolution: Qt.size(r, r)
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_4.qml b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_4.qml
index 9d91da0bb2..f1f31e6f90 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_4.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_4.qml
@@ -40,7 +40,7 @@ Rectangle {
}
smooth: true
}
- vertexShader: "qrc:shaders/wave.vert"
+ vertexShader: "qrc:shaders/wave.vert.qsb"
mesh: GridMesh {
property int r: 4
resolution: Qt.size(r, r)
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_8.qml b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_8.qml
index c436c0f8e4..bd7fee50a4 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_8.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_8.qml
@@ -40,7 +40,7 @@ Rectangle {
}
smooth: true
}
- vertexShader: "qrc:shaders/wave.vert"
+ vertexShader: "qrc:shaders/wave.vert.qsb"
mesh: GridMesh {
property int r: 8
resolution: Qt.size(r, r)
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_1.qml
index 7c5b5efac5..ef16489282 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_1.qml
@@ -43,6 +43,6 @@ Item {
property variant offset: Qt.size(4 / width, 4 / height)
property variant delta: Qt.size(0.5 / width, 0.5 / height)
- fragmentShader: "qrc:shaders/shadow.frag"
+ fragmentShader: "qrc:shaders/shadow.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_2.qml
index 64b950ace4..ca08a124fd 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_2.qml
@@ -43,6 +43,6 @@ Item {
property variant offset: Qt.size(4 / width, 4 / height)
property variant delta: Qt.size(0.5 / width, 0.5 / height)
- fragmentShader: "qrc:shaders/shadow.frag"
+ fragmentShader: "qrc:shaders/shadow.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_1.qml
index b071715cf2..bd9d534624 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_1.qml
@@ -43,6 +43,6 @@ Item {
property variant offset: Qt.size(4 / width, 4 / height)
property variant delta: Qt.size(0.5 / width, 0.5 / height)
- fragmentShader: "qrc:shaders/shadow.frag"
+ fragmentShader: "qrc:shaders/shadow.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_2.qml
index 02ac70e69c..00cec276dc 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_2.qml
@@ -43,6 +43,6 @@ Item {
property variant offset: Qt.size(4 / width, 4 / height)
property variant delta: Qt.size(0.5 / width, 0.5 / height)
- fragmentShader: "qrc:shaders/shadow.frag"
+ fragmentShader: "qrc:shaders/shadow.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/image/async.qml b/tests/manual/scenegraph_lancelot/data/shaders/image/async.qml
index c4cf4cc1e4..79f2642c6d 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/image/async.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/image/async.qml
@@ -14,7 +14,7 @@ Item {
ShaderEffect {
anchors.fill: image
property variant source: image
- fragmentShader: "qrc:shaders/gradient2.frag"
+ fragmentShader: "qrc:shaders/gradient2.frag.qsb"
visible: image.status == Image.Ready
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/image/source.qml b/tests/manual/scenegraph_lancelot/data/shaders/image/source.qml
index 04406829b3..e3150cd085 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/image/source.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/image/source.qml
@@ -13,6 +13,6 @@ Item {
ShaderEffect {
anchors.fill: image
property variant source: image
- fragmentShader: "qrc:shaders/gradient2.frag"
+ fragmentShader: "qrc:shaders/gradient2.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/layer/layer.qml b/tests/manual/scenegraph_lancelot/data/shaders/layer/layer.qml
index 4f9a2a4fc3..0e591ea0e8 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/layer/layer.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/layer/layer.qml
@@ -18,6 +18,6 @@ Item {
layer.enabled: true
layer.samplerName: "source"
layer.effect: ShaderEffect {
- fragmentShader: "qrc:shaders/desaturate.frag"
+ fragmentShader: "qrc:shaders/desaturate.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_1.qml
index 97b5760854..99801e83b4 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_1.qml
@@ -32,6 +32,6 @@ Item {
property variant source: source
- fragmentShader: "qrc:shaders/gradient3.frag"
+ fragmentShader: "qrc:shaders/gradient3.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_2.qml
index ea3456838c..9bfde80098 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_2.qml
@@ -32,6 +32,6 @@ Item {
property variant source: source
- fragmentShader: "qrc:shaders/gradient3.frag"
+ fragmentShader: "qrc:shaders/gradient3.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_1.qml
index 9f0162ccd3..b99c0b66d5 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_1.qml
@@ -38,7 +38,7 @@ Item {
property variant source: source1
- fragmentShader: "qrc:shaders/gradient4.frag"
+ fragmentShader: "qrc:shaders/gradient4.frag.qsb"
}
ShaderEffect {
@@ -48,7 +48,7 @@ Item {
property variant source: source2
- fragmentShader: "qrc:shaders/gradient3.frag"
+ fragmentShader: "qrc:shaders/gradient3.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_2.qml
index e0c218ca69..366c57428c 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_2.qml
@@ -38,7 +38,7 @@ Item {
property variant source: source1
- fragmentShader: "qrc:shaders/gradient4.frag"
+ fragmentShader: "qrc:shaders/gradient4.frag.qsb"
}
ShaderEffect {
@@ -48,7 +48,7 @@ Item {
property variant source: source2
- fragmentShader: "qrc:shaders/gradient3.frag"
+ fragmentShader: "qrc:shaders/gradient3.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/live/samesource.qml b/tests/manual/scenegraph_lancelot/data/shaders/live/samesource.qml
index 5b1f15c01c..f7cd8e3387 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/live/samesource.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/live/samesource.qml
@@ -24,7 +24,7 @@ Item {
property variant source: source
- fragmentShader: "qrc:shaders/gradient3.frag"
+ fragmentShader: "qrc:shaders/gradient3.frag.qsb"
}
ShaderEffect {
@@ -34,6 +34,6 @@ Item {
property variant source: source
- fragmentShader: "qrc:shaders/gradient5.frag"
+ fragmentShader: "qrc:shaders/gradient5.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/property.qml b/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/property.qml
index c58380aca8..5978564247 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/property.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/property.qml
@@ -10,7 +10,7 @@ Item {
width: 300
height: 200
property real colorProperty: 0.5
- fragmentShader: "qrc:shaders/property.frag"
+ fragmentShader: "qrc:shaders/property.frag.qsb"
}
ShaderEffect {
@@ -19,7 +19,7 @@ Item {
width: 300
height: 200
property real colorProperty: 0.0
- fragmentShader: "qrc:shaders/property.frag"
+ fragmentShader: "qrc:shaders/property.frag.qsb"
NumberAnimation on colorProperty {
duration: 200
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator.qml b/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator.qml
index 3e98088d81..006fc12526 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator.qml
@@ -10,7 +10,7 @@ Item {
width: 300
height: 200
property real colorProperty: 0.0
- fragmentShader: "qrc:shaders/property.frag"
+ fragmentShader: "qrc:shaders/property.frag.qsb"
UniformAnimator on colorProperty {
duration: 20
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator_stall.qml b/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator_stall.qml
index e62c64e3ae..ed5c7ce2c1 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator_stall.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator_stall.qml
@@ -21,7 +21,7 @@ Item {
width: 200
height: 200
property real colorProperty: 0.0
- fragmentShader: "qrc:shaders/property.frag"
+ fragmentShader: "qrc:shaders/property.frag.qsb"
UniformAnimator {
id: animator
target: shader
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/one-source.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/one-source.qml
index 309db50ba2..5f963dd54a 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/one-source.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/one-source.qml
@@ -23,6 +23,6 @@ Item {
property variant source: source
- fragmentShader: "qrc:shaders/gradient.frag"
+ fragmentShader: "qrc:shaders/gradient.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml
index 75a0d2a151..863bff683d 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml
@@ -31,7 +31,7 @@ Item {
sourceItem: text
sourceRect: Qt.rect(x0 - text.x, y0 - text.y, w, h)
}
- fragmentShader: "qrc:shaders/gradient.frag"
+ fragmentShader: "qrc:shaders/gradient.frag.qsb"
}
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_1.qml
index 2b04b76482..c4252bbc94 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_1.qml
@@ -47,7 +47,7 @@ Item {
property variant source: source
- fragmentShader: "qrc:shaders/gradient.frag"
+ fragmentShader: "qrc:shaders/gradient.frag.qsb"
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_2.qml
index 0ce09cda18..a6ebcb6325 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_2.qml
@@ -47,7 +47,7 @@ Item {
property variant source: source
- fragmentShader: "qrc:shaders/gradient.frag"
+ fragmentShader: "qrc:shaders/gradient.frag.qsb"
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml
index c02dfba9e2..fabf818c93 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml
@@ -47,7 +47,7 @@ Item {
property variant source: source
- fragmentShader: "qrc:shaders/gradient.frag"
+ fragmentShader: "qrc:shaders/gradient.frag.qsb"
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/two-sources.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/two-sources.qml
index dbb82a278e..e20d335220 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/two-sources.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/two-sources.qml
@@ -44,6 +44,6 @@ Item {
property variant colorSource: colorSource
property variant maskSource: maskSource;
- fragmentShader: "qrc:shaders/stencil.frag"
+ fragmentShader: "qrc:shaders/stencil.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/visible_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/visible_1.qml
index 309028807f..32625baecf 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/visible_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/visible_1.qml
@@ -27,6 +27,6 @@ Item {
property variant source: source
- fragmentShader: "qrc:shaders/gradient.frag"
+ fragmentShader: "qrc:shaders/gradient.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/visible_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/visible_2.qml
index df05c8f087..0aad070391 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/visible_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/visible_2.qml
@@ -27,6 +27,6 @@ Item {
property variant source: source
- fragmentShader: "qrc:shaders/gradient.frag"
+ fragmentShader: "qrc:shaders/gradient.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/texture/size.qml b/tests/manual/scenegraph_lancelot/data/shaders/texture/size.qml
index 5738da5e8d..d97a5859ab 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/texture/size.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/texture/size.qml
@@ -18,7 +18,7 @@ Item {
property variant textureSize: source.textureSize
property color color: "black"
- fragmentShader: "qrc:shaders/edge.frag"
+ fragmentShader: "qrc:shaders/edge.frag.qsb"
}
Text {
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/wrap/modes.qml b/tests/manual/scenegraph_lancelot/data/shaders/wrap/modes.qml
index baa002dc50..70fcef1f3a 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/wrap/modes.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/wrap/modes.qml
@@ -48,6 +48,6 @@ Item {
property variant yellow: repeat
property variant black: clamp
- fragmentShader: "qrc:shaders/cmyk.frag"
+ fragmentShader: "qrc:shaders/cmyk.frag.qsb"
}
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic.frag
deleted file mode 100644
index 15459ffdb9..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic_alpha.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic_alpha.frag
deleted file mode 100644
index 277d07f7ae..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic_alpha.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/cmyk.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/cmyk.frag
deleted file mode 100644
index 5ef0333b6b..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/cmyk.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/culling.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/culling.frag
deleted file mode 100644
index 97a021fe3e..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/culling.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/desaturate.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/desaturate.frag
deleted file mode 100644
index 42a11de194..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/desaturate.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/edge.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/edge.frag
deleted file mode 100644
index aecaa621ef..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/edge.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient.frag
deleted file mode 100644
index ef7a9c10ca..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient2.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient2.frag
deleted file mode 100644
index ca58580786..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient2.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient3.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient3.frag
deleted file mode 100644
index e1fc8b0ce8..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient3.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient4.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient4.frag
deleted file mode 100644
index 2e0b809d7d..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient4.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient5.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient5.frag
deleted file mode 100644
index 106c2c5515..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient5.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradientgrid.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradientgrid.frag
deleted file mode 100644
index 56bcd200fe..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradientgrid.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/property.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/property.frag
deleted file mode 100644
index 078252cad4..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/property.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/shadow.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/shadow.frag
deleted file mode 100644
index 788a047ab0..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/shadow.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/stencil.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/stencil.frag
deleted file mode 100644
index e3907a90d2..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/stencil.frag
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/subrect.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/subrect.vert
deleted file mode 100644
index 623df9a177..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/subrect.vert
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/wave.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/wave.vert
deleted file mode 100644
index 14cb4e768f..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/wave.vert
+++ /dev/null
Binary files differ
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic.frag
index 6b3a881174..aa850af449 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic.frag
@@ -1,5 +1,8 @@
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
void main() {
- gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1);
+ fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1);
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha.frag
index e04a71d816..2fb1fbe91b 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha.frag
@@ -1,7 +1,10 @@
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
void main() {
lowp float u = qt_TexCoord0.x;
lowp float v = qt_TexCoord0.y;
- gl_FragColor = vec4(u*v, v*v, v, v);
+ fragColor = vec4(u*v, v*v, v, v);
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha_rhi.frag
deleted file mode 100644
index 2fb1fbe91b..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha_rhi.frag
+++ /dev/null
@@ -1,10 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-void main() {
- lowp float u = qt_TexCoord0.x;
- lowp float v = qt_TexCoord0.y;
- fragColor = vec4(u*v, v*v, v, v);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_rhi.frag
deleted file mode 100644
index aa850af449..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_rhi.frag
+++ /dev/null
@@ -1,8 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-void main() {
- fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk.frag
index d63a0fa6ee..5d528e1d7a 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk.frag
@@ -1,14 +1,18 @@
-uniform lowp sampler2D cyan;
-uniform lowp sampler2D magenta;
-uniform lowp sampler2D yellow;
-uniform lowp sampler2D black;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D cyan;
+layout(binding = 2) uniform sampler2D magenta;
+layout(binding = 3) uniform sampler2D yellow;
+layout(binding = 4) uniform sampler2D black;
+
void main() {
- highp vec2 t = qt_TexCoord0 * 3. - 1.;
- lowp float c = texture2D(cyan, t + vec2(.05, .09)).a;
- lowp float m = texture2D(magenta, t + vec2(.04, -.10)).a;
- lowp float y = texture2D(yellow, t + vec2(-.10, .01)).a;
- lowp float k = texture2D(black, t).a;
- gl_FragColor = 1. - vec4(c + k, m + k, y + k, 0.);
+ vec2 t = qt_TexCoord0 * 3. - 1.;
+ lowp float c = texture(cyan, t + vec2(.05, .09)).a;
+ lowp float m = texture(magenta, t + vec2(.04, -.10)).a;
+ lowp float y = texture(yellow, t + vec2(-.10, .01)).a;
+ lowp float k = texture(black, t).a;
+ fragColor = 1. - vec4(c + k, m + k, y + k, 0.);
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk_rhi.frag
deleted file mode 100644
index 5d528e1d7a..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk_rhi.frag
+++ /dev/null
@@ -1,18 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D cyan;
-layout(binding = 2) uniform sampler2D magenta;
-layout(binding = 3) uniform sampler2D yellow;
-layout(binding = 4) uniform sampler2D black;
-
-void main() {
- vec2 t = qt_TexCoord0 * 3. - 1.;
- lowp float c = texture(cyan, t + vec2(.05, .09)).a;
- lowp float m = texture(magenta, t + vec2(.04, -.10)).a;
- lowp float y = texture(yellow, t + vec2(-.10, .01)).a;
- lowp float k = texture(black, t).a;
- fragColor = 1. - vec4(c + k, m + k, y + k, 0.);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/compile.bat b/tests/manual/scenegraph_lancelot/data/shared/shaders/compile.bat
deleted file mode 100644
index e13d1f074e..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/compile.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/subrect.vert subrect_rhi.vert
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/wave.vert wave_rhi.vert
-
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/basic.frag basic_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/basic_alpha.frag basic_alpha_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/cmyk.frag cmyk_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/culling.frag culling_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/desaturate.frag desaturate_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/edge.frag edge_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient.frag gradient_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient2.frag gradient2_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient3.frag gradient3_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient4.frag gradient4_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient5.frag gradient5_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradientgrid.frag gradientgrid_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/property.frag property_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/shadow.frag shadow_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/stencil.frag stencil_rhi.frag
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/culling.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/culling.frag
index 1b12df7c6d..cc3c9a0f14 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/culling.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/culling.frag
@@ -1,9 +1,13 @@
-varying highp vec2 qt_TexCoord0;
-uniform sampler2D frontSource;
-uniform sampler2D backSource;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D frontSource;
+layout(binding = 2) uniform sampler2D backSource;
+
void main() {
- gl_FragColor = gl_FrontFacing
- ? texture2D(frontSource, qt_TexCoord0)
- : texture2D(backSource, qt_TexCoord0);
+ fragColor = gl_FrontFacing
+ ? texture(frontSource, qt_TexCoord0)
+ : texture(backSource, qt_TexCoord0);
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/culling_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/culling_rhi.frag
deleted file mode 100644
index cc3c9a0f14..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/culling_rhi.frag
+++ /dev/null
@@ -1,13 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D frontSource;
-layout(binding = 2) uniform sampler2D backSource;
-
-void main() {
- fragColor = gl_FrontFacing
- ? texture(frontSource, qt_TexCoord0)
- : texture(backSource, qt_TexCoord0);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate.frag
index a38f3d1de2..a4299c6d68 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate.frag
@@ -1,9 +1,12 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+layout(binding = 1) uniform sampler2D source;
void main() {
- lowp vec4 c = texture2D(source, qt_TexCoord0);
+ lowp vec4 c = texture(source, qt_TexCoord0);
lowp float level = c.r * 0.3 + c.g * 0.59 + c.b * 0.11;
- gl_FragColor = vec4(level, level, level, c.a);
+ fragColor = vec4(level, level, level, c.a);
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate_rhi.frag
deleted file mode 100644
index a4299c6d68..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate_rhi.frag
+++ /dev/null
@@ -1,12 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-layout(binding = 1) uniform sampler2D source;
-
-void main() {
- lowp vec4 c = texture(source, qt_TexCoord0);
- lowp float level = c.r * 0.3 + c.g * 0.59 + c.b * 0.11;
-
- fragColor = vec4(level, level, level, c.a);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/edge.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/edge.frag
index 8cb616f3e0..77d7b47499 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/edge.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/edge.frag
@@ -1,14 +1,23 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
-uniform highp vec2 textureSize;
-uniform lowp vec4 color;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
+layout(std140, binding = 0) uniform buf {
+ mat4 qt_Matrix;
+ float qt_Opacity;
+ vec2 textureSize;
+ vec4 color;
+} ubuf;
+
void main() {
- highp vec2 dx = vec2(0.5 / textureSize.x, 0.);
- highp vec2 dy = vec2(0., 0.5 / textureSize.y);
- gl_FragColor = color * 0.25
- * (texture2D(source, qt_TexCoord0 + dx + dy).a
- + texture2D(source, qt_TexCoord0 + dx - dy).a
- + texture2D(source, qt_TexCoord0 - dx + dy).a
- + texture2D(source, qt_TexCoord0 - dx - dy).a);
+ vec2 dx = vec2(0.5 / ubuf.textureSize.x, 0.);
+ vec2 dy = vec2(0., 0.5 / ubuf.textureSize.y);
+ fragColor = ubuf.color * 0.25
+ * (texture(source, qt_TexCoord0 + dx + dy).a
+ + texture(source, qt_TexCoord0 + dx - dy).a
+ + texture(source, qt_TexCoord0 - dx + dy).a
+ + texture(source, qt_TexCoord0 - dx - dy).a);
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/edge_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/edge_rhi.frag
deleted file mode 100644
index 77d7b47499..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/edge_rhi.frag
+++ /dev/null
@@ -1,23 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-layout(std140, binding = 0) uniform buf {
- mat4 qt_Matrix;
- float qt_Opacity;
- vec2 textureSize;
- vec4 color;
-} ubuf;
-
-void main() {
- vec2 dx = vec2(0.5 / ubuf.textureSize.x, 0.);
- vec2 dy = vec2(0., 0.5 / ubuf.textureSize.y);
- fragColor = ubuf.color * 0.25
- * (texture(source, qt_TexCoord0 + dx + dy).a
- + texture(source, qt_TexCoord0 + dx - dy).a
- + texture(source, qt_TexCoord0 - dx + dy).a
- + texture(source, qt_TexCoord0 - dx - dy).a);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient.frag
index c581cc0c73..84eee1dbfe 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient.frag
@@ -1,6 +1,10 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
void main() {
- gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1) * texture2D(source, qt_TexCoord0).a;
+ fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1) * texture(source, qt_TexCoord0).a;
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2.frag
index 5f07e56d4a..b08e6339b3 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2.frag
@@ -1,6 +1,10 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
void main() {
- gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 0, 1) + texture2D(source, qt_TexCoord0);
+ fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 0, 1) + texture(source, qt_TexCoord0);
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2_rhi.frag
deleted file mode 100644
index b08e6339b3..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2_rhi.frag
+++ /dev/null
@@ -1,10 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-void main() {
- fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 0, 1) + texture(source, qt_TexCoord0);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3.frag
index 61c9d46f94..2e523c2879 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3.frag
@@ -1,6 +1,10 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
void main() {
- gl_FragColor = vec4(0, qt_TexCoord0.y, 1, 1) * texture2D(source, qt_TexCoord0).a;
+ fragColor = vec4(0, qt_TexCoord0.y, 1, 1) * texture(source, qt_TexCoord0).a;
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3_rhi.frag
deleted file mode 100644
index 2e523c2879..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3_rhi.frag
+++ /dev/null
@@ -1,10 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-void main() {
- fragColor = vec4(0, qt_TexCoord0.y, 1, 1) * texture(source, qt_TexCoord0).a;
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4.frag
index 81d96ce126..a100ba2cd7 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4.frag
@@ -1,6 +1,10 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
void main() {
- gl_FragColor = vec4(1, qt_TexCoord0.y, 0, 1) * texture2D(source, qt_TexCoord0).a;
+ fragColor = vec4(1, qt_TexCoord0.y, 0, 1) * texture(source, qt_TexCoord0).a;
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4_rhi.frag
deleted file mode 100644
index a100ba2cd7..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4_rhi.frag
+++ /dev/null
@@ -1,10 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-void main() {
- fragColor = vec4(1, qt_TexCoord0.y, 0, 1) * texture(source, qt_TexCoord0).a;
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5.frag
index 33485542af..4ec104bd14 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5.frag
@@ -1,6 +1,10 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
void main() {
- gl_FragColor = vec4(qt_TexCoord0.x, 1, 0, 1) * texture2D(source, qt_TexCoord0).a;
+ fragColor = vec4(qt_TexCoord0.x, 1, 0, 1) * texture(source, qt_TexCoord0).a;
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5_rhi.frag
deleted file mode 100644
index 4ec104bd14..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5_rhi.frag
+++ /dev/null
@@ -1,10 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-void main() {
- fragColor = vec4(qt_TexCoord0.x, 1, 0, 1) * texture(source, qt_TexCoord0).a;
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient_rhi.frag
deleted file mode 100644
index 84eee1dbfe..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient_rhi.frag
+++ /dev/null
@@ -1,10 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-void main() {
- fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1) * texture(source, qt_TexCoord0).a;
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid.frag
index 851f07c948..999629745b 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid.frag
@@ -1,9 +1,13 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
void main() {
lowp float r = mod(qt_TexCoord0.x * 10.0, 1.0);
lowp float g = mod(qt_TexCoord0.y * 10.0, 1.0);
lowp float b = qt_TexCoord0.x;
- gl_FragColor = vec4(r, g, b, 1) * texture2D(source, qt_TexCoord0).a;
+ fragColor = vec4(r, g, b, 1) * texture(source, qt_TexCoord0).a;
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid_rhi.frag
deleted file mode 100644
index 999629745b..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid_rhi.frag
+++ /dev/null
@@ -1,13 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-void main() {
- lowp float r = mod(qt_TexCoord0.x * 10.0, 1.0);
- lowp float g = mod(qt_TexCoord0.y * 10.0, 1.0);
- lowp float b = qt_TexCoord0.x;
- fragColor = vec4(r, g, b, 1) * texture(source, qt_TexCoord0).a;
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/property.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/property.frag
index 0d28bff43b..2ffa707fb1 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/property.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/property.frag
@@ -1,6 +1,14 @@
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
-uniform lowp float colorProperty;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform buf {
+ mat4 qt_Matrix;
+ float qt_Opacity;
+ float colorProperty;
+} ubuf;
+
void main() {
- gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, colorProperty, 1);
+ fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, ubuf.colorProperty, 1);
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/property_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/property_rhi.frag
deleted file mode 100644
index 2ffa707fb1..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/property_rhi.frag
+++ /dev/null
@@ -1,14 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(std140, binding = 0) uniform buf {
- mat4 qt_Matrix;
- float qt_Opacity;
- float colorProperty;
-} ubuf;
-
-void main() {
- fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, ubuf.colorProperty, 1);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow.frag
index 0a6cdf3044..6a2d8dc122 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow.frag
@@ -1,14 +1,23 @@
-uniform lowp sampler2D source;
-uniform highp vec2 offset;
-uniform highp vec2 delta;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
+layout(std140, binding = 0) uniform buf {
+ mat4 qt_Matrix;
+ float qt_Opacity;
+ vec2 offset;
+ vec2 delta;
+} ubuf;
+
void main() {
- highp vec2 delta2 = vec2(delta.x, -delta.y);
- lowp float shadow = 0.25 * (texture2D(source, qt_TexCoord0 - offset + delta).a
- + texture2D(source, qt_TexCoord0 - offset - delta).a
- + texture2D(source, qt_TexCoord0 - offset + delta2).a
- + texture2D(source, qt_TexCoord0 - offset - delta2).a);
- lowp vec4 color = texture2D(source, qt_TexCoord0);
- gl_FragColor = mix(vec4(vec3(0.), 0.5 * shadow), color, color.a);
+ vec2 delta2 = vec2(ubuf.delta.x, -ubuf.delta.y);
+ float shadow = 0.25 * (texture(source, qt_TexCoord0 - ubuf.offset + ubuf.delta).a
+ + texture(source, qt_TexCoord0 - ubuf.offset - ubuf.delta).a
+ + texture(source, qt_TexCoord0 - ubuf.offset + delta2).a
+ + texture(source, qt_TexCoord0 - ubuf.offset - delta2).a);
+ vec4 color = texture(source, qt_TexCoord0);
+ fragColor = mix(vec4(vec3(0.), 0.5 * shadow), color, color.a);
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow_rhi.frag
deleted file mode 100644
index 6a2d8dc122..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow_rhi.frag
+++ /dev/null
@@ -1,23 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-layout(std140, binding = 0) uniform buf {
- mat4 qt_Matrix;
- float qt_Opacity;
- vec2 offset;
- vec2 delta;
-} ubuf;
-
-void main() {
- vec2 delta2 = vec2(ubuf.delta.x, -ubuf.delta.y);
- float shadow = 0.25 * (texture(source, qt_TexCoord0 - ubuf.offset + ubuf.delta).a
- + texture(source, qt_TexCoord0 - ubuf.offset - ubuf.delta).a
- + texture(source, qt_TexCoord0 - ubuf.offset + delta2).a
- + texture(source, qt_TexCoord0 - ubuf.offset - delta2).a);
- vec4 color = texture(source, qt_TexCoord0);
- fragColor = mix(vec4(vec3(0.), 0.5 * shadow), color, color.a);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil.frag
index 33c6cee064..734be73fdb 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil.frag
@@ -1,7 +1,11 @@
-uniform lowp sampler2D maskSource;
-uniform lowp sampler2D colorSource;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D maskSource;
+layout(binding = 2) uniform sampler2D colorSource;
+
void main() {
- gl_FragColor = texture2D(maskSource, qt_TexCoord0).a * texture2D(colorSource, qt_TexCoord0.yx);
+ fragColor = texture(maskSource, qt_TexCoord0).a * texture(colorSource, qt_TexCoord0.yx);
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil_rhi.frag
deleted file mode 100644
index 734be73fdb..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil_rhi.frag
+++ /dev/null
@@ -1,11 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D maskSource;
-layout(binding = 2) uniform sampler2D colorSource;
-
-void main() {
- fragColor = texture(maskSource, qt_TexCoord0).a * texture(colorSource, qt_TexCoord0.yx);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect.vert
index 2ab6f94c19..96494b7149 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect.vert
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect.vert
@@ -1,11 +1,17 @@
-uniform highp mat4 qt_Matrix;
-attribute highp vec4 qt_Vertex;
-attribute highp vec2 qt_MultiTexCoord0;
-varying highp vec2 qt_TexCoord0;
-uniform highp vec4 qt_SubRect_source;
+#version 440
+
+layout(location = 0) in vec4 qt_Vertex;
+layout(location = 1) in vec2 qt_MultiTexCoord0;
+
+layout(location = 0) out vec2 qt_TexCoord0;
+
+layout(std140, binding = 0) uniform buf {
+ mat4 qt_Matrix;
+ vec4 qt_SubRect_source;
+} ubuf;
void main()
{
- qt_TexCoord0 = qt_SubRect_source.xy + qt_SubRect_source.zw * qt_MultiTexCoord0;
- gl_Position = qt_Matrix * qt_Vertex;
+ qt_TexCoord0 = ubuf.qt_SubRect_source.xy + ubuf.qt_SubRect_source.zw * qt_MultiTexCoord0;
+ gl_Position = ubuf.qt_Matrix * qt_Vertex;
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect_rhi.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect_rhi.vert
deleted file mode 100644
index 96494b7149..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect_rhi.vert
+++ /dev/null
@@ -1,17 +0,0 @@
-#version 440
-
-layout(location = 0) in vec4 qt_Vertex;
-layout(location = 1) in vec2 qt_MultiTexCoord0;
-
-layout(location = 0) out vec2 qt_TexCoord0;
-
-layout(std140, binding = 0) uniform buf {
- mat4 qt_Matrix;
- vec4 qt_SubRect_source;
-} ubuf;
-
-void main()
-{
- qt_TexCoord0 = ubuf.qt_SubRect_source.xy + ubuf.qt_SubRect_source.zw * qt_MultiTexCoord0;
- gl_Position = ubuf.qt_Matrix * qt_Vertex;
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/wave.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/wave.vert
index 38e523c06b..38f6173773 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/wave.vert
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/wave.vert
@@ -1,12 +1,18 @@
-uniform highp mat4 qt_Matrix;
-attribute highp vec4 qt_Vertex;
-attribute highp vec2 qt_MultiTexCoord0;
-varying highp vec2 qt_TexCoord0;
+#version 440
+
+layout(location = 0) in vec4 qt_Vertex;
+layout(location = 1) in vec2 qt_MultiTexCoord0;
+
+layout(location = 0) out vec2 qt_TexCoord0;
+
+layout(std140, binding = 0) uniform buf {
+ mat4 qt_Matrix;
+} ubuf;
void main() {
- highp vec4 pos = qt_Vertex;
+ vec4 pos = qt_Vertex;
pos.x += sin(qt_Vertex.y * 0.02) * 20.;
pos.y += sin(qt_Vertex.x * 0.02) * 20.;
- gl_Position = qt_Matrix * pos;
+ gl_Position = ubuf.qt_Matrix * pos;
qt_TexCoord0 = qt_MultiTexCoord0;
}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/wave_rhi.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/wave_rhi.vert
deleted file mode 100644
index 38f6173773..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/wave_rhi.vert
+++ /dev/null
@@ -1,18 +0,0 @@
-#version 440
-
-layout(location = 0) in vec4 qt_Vertex;
-layout(location = 1) in vec2 qt_MultiTexCoord0;
-
-layout(location = 0) out vec2 qt_TexCoord0;
-
-layout(std140, binding = 0) uniform buf {
- mat4 qt_Matrix;
-} ubuf;
-
-void main() {
- vec4 pos = qt_Vertex;
- pos.x += sin(qt_Vertex.y * 0.02) * 20.;
- pos.y += sin(qt_Vertex.x * 0.02) * 20.;
- gl_Position = ubuf.qt_Matrix * pos;
- qt_TexCoord0 = qt_MultiTexCoord0;
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shared.qrc b/tests/manual/scenegraph_lancelot/data/shared/shared.qrc
deleted file mode 100644
index 4bd955b2b2..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shared.qrc
+++ /dev/null
@@ -1,38 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file>shaders/basic.frag</file>
- <file>shaders/basic_alpha.frag</file>
- <file>shaders/cmyk.frag</file>
- <file>shaders/culling.frag</file>
- <file>shaders/desaturate.frag</file>
- <file>shaders/edge.frag</file>
- <file>shaders/gradient.frag</file>
- <file>shaders/gradient2.frag</file>
- <file>shaders/gradient3.frag</file>
- <file>shaders/gradient4.frag</file>
- <file>shaders/gradient5.frag</file>
- <file>shaders/gradientgrid.frag</file>
- <file>shaders/property.frag</file>
- <file>shaders/shadow.frag</file>
- <file>shaders/stencil.frag</file>
- <file>shaders/subrect.vert</file>
- <file>shaders/wave.vert</file>
- <file>shaders/+qsb/basic.frag</file>
- <file>shaders/+qsb/basic_alpha.frag</file>
- <file>shaders/+qsb/cmyk.frag</file>
- <file>shaders/+qsb/culling.frag</file>
- <file>shaders/+qsb/desaturate.frag</file>
- <file>shaders/+qsb/edge.frag</file>
- <file>shaders/+qsb/gradient.frag</file>
- <file>shaders/+qsb/gradient2.frag</file>
- <file>shaders/+qsb/gradient3.frag</file>
- <file>shaders/+qsb/gradient4.frag</file>
- <file>shaders/+qsb/gradient5.frag</file>
- <file>shaders/+qsb/gradientgrid.frag</file>
- <file>shaders/+qsb/property.frag</file>
- <file>shaders/+qsb/shadow.frag</file>
- <file>shaders/+qsb/stencil.frag</file>
- <file>shaders/+qsb/subrect.vert</file>
- <file>shaders/+qsb/wave.vert</file>
- </qresource>
-</RCC>
diff --git a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
index abf5f648dd..0514b6660e 100644
--- a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
+++ b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from scenegrabber.pro.
-
#####################################################################
## qmlscenegrabber Binary:
#####################################################################
@@ -13,152 +11,26 @@ qt_internal_add_manual_test(qmlscenegrabber
Qt::Quick
)
-# Resources:
-set_source_files_properties("../data/shared/shaders/+qsb/basic.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/basic.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/basic_alpha.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/basic_alpha.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/cmyk.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/cmyk.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/culling.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/culling.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/desaturate.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/desaturate.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/edge.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/edge.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/gradient.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/gradient.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/gradient2.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/gradient2.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/gradient3.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/gradient3.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/gradient4.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/gradient4.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/gradient5.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/gradient5.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/gradientgrid.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/gradientgrid.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/property.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/property.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/shadow.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/shadow.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/stencil.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/stencil.frag"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/subrect.vert"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/subrect.vert"
-)
-set_source_files_properties("../data/shared/shaders/+qsb/wave.vert"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/+qsb/wave.vert"
-)
-set_source_files_properties("../data/shared/shaders/basic.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/basic.frag"
-)
-set_source_files_properties("../data/shared/shaders/basic_alpha.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/basic_alpha.frag"
-)
-set_source_files_properties("../data/shared/shaders/cmyk.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/cmyk.frag"
-)
-set_source_files_properties("../data/shared/shaders/culling.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/culling.frag"
-)
-set_source_files_properties("../data/shared/shaders/desaturate.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/desaturate.frag"
-)
-set_source_files_properties("../data/shared/shaders/edge.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/edge.frag"
-)
-set_source_files_properties("../data/shared/shaders/gradient.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/gradient.frag"
-)
-set_source_files_properties("../data/shared/shaders/gradient2.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/gradient2.frag"
-)
-set_source_files_properties("../data/shared/shaders/gradient3.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/gradient3.frag"
-)
-set_source_files_properties("../data/shared/shaders/gradient4.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/gradient4.frag"
-)
-set_source_files_properties("../data/shared/shaders/gradient5.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/gradient5.frag"
-)
-set_source_files_properties("../data/shared/shaders/gradientgrid.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/gradientgrid.frag"
-)
-set_source_files_properties("../data/shared/shaders/property.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/property.frag"
-)
-set_source_files_properties("../data/shared/shaders/shadow.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/shadow.frag"
-)
-set_source_files_properties("../data/shared/shaders/stencil.frag"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/stencil.frag"
-)
-set_source_files_properties("../data/shared/shaders/subrect.vert"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/subrect.vert"
-)
-set_source_files_properties("../data/shared/shaders/wave.vert"
- PROPERTIES QT_RESOURCE_ALIAS "shaders/wave.vert"
-)
-set(shared_resource_files
- "shaders/+qsb/basic.frag"
- "shaders/+qsb/basic_alpha.frag"
- "shaders/+qsb/cmyk.frag"
- "shaders/+qsb/culling.frag"
- "shaders/+qsb/desaturate.frag"
- "shaders/+qsb/edge.frag"
- "shaders/+qsb/gradient.frag"
- "shaders/+qsb/gradient2.frag"
- "shaders/+qsb/gradient3.frag"
- "shaders/+qsb/gradient4.frag"
- "shaders/+qsb/gradient5.frag"
- "shaders/+qsb/gradientgrid.frag"
- "shaders/+qsb/property.frag"
- "shaders/+qsb/shadow.frag"
- "shaders/+qsb/stencil.frag"
- "shaders/+qsb/subrect.vert"
- "shaders/+qsb/wave.vert"
- "shaders/basic.frag"
- "shaders/basic_alpha.frag"
- "shaders/cmyk.frag"
- "shaders/culling.frag"
- "shaders/desaturate.frag"
- "shaders/edge.frag"
- "shaders/gradient.frag"
- "shaders/gradient2.frag"
- "shaders/gradient3.frag"
- "shaders/gradient4.frag"
- "shaders/gradient5.frag"
- "shaders/gradientgrid.frag"
- "shaders/property.frag"
- "shaders/shadow.frag"
- "shaders/stencil.frag"
- "shaders/subrect.vert"
- "shaders/wave.vert"
-)
-
-qt_internal_add_resource(qmlscenegrabber "shared"
+qt6_add_shaders(qmlscenegrabber "qmlscenegrabber_shaders"
+ BATCHABLE
PREFIX
- "/"
- BASE
- "../data/shared"
+ "shaders"
FILES
- ${shared_resource_files}
+ "../data/shared/shaders/basic_alpha.frag"
+ "../data/shared/shaders/basic.frag"
+ "../data/shared/shaders/cmyk.frag"
+ "../data/shared/shaders/culling.frag"
+ "../data/shared/shaders/desaturate.frag"
+ "../data/shared/shaders/edge.frag"
+ "../data/shared/shaders/gradient2.frag"
+ "../data/shared/shaders/gradient3.frag"
+ "../data/shared/shaders/gradient4.frag"
+ "../data/shared/shaders/gradient5.frag"
+ "../data/shared/shaders/gradient.frag"
+ "../data/shared/shaders/gradientgrid.frag"
+ "../data/shared/shaders/property.frag"
+ "../data/shared/shaders/shadow.frag"
+ "../data/shared/shaders/stencil.frag"
+ "../data/shared/shaders/subrect.vert"
+ "../data/shared/shaders/wave.vert"
)
-
diff --git a/tests/manual/text/CMakeLists.txt b/tests/manual/text/CMakeLists.txt
index 78c07f6ca8..524dedbcb0 100644
--- a/tests/manual/text/CMakeLists.txt
+++ b/tests/manual/text/CMakeLists.txt
@@ -27,51 +27,19 @@ qt_internal_add_resource(text "qml"
FILES
${qml_resource_files}
)
-set_source_files_properties("../../../examples/quick/shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../../../examples/quick/shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../../../examples/quick/shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
+
set(quick_shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/slider_handle.png"
+ "../../../examples/quick/shared/Button.qml"
+ "../../../examples/quick/shared/CheckBox.qml"
+ "../../../examples/quick/shared/Label.qml"
+ "../../../examples/quick/shared/LauncherList.qml"
+ "../../../examples/quick/shared/SimpleLauncherDelegate.qml"
+ "../../../examples/quick/shared/Slider.qml"
+ "../../../examples/quick/shared/TextField.qml"
+ "../../../examples/quick/shared/images/back.png"
+ "../../../examples/quick/shared/images/checkmark.png"
+ "../../../examples/quick/shared/images/next.png"
+ "../../../examples/quick/shared/images/slider_handle.png"
)
qt_internal_add_resource(text "quick_shared"
diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt
index 28e26e30c3..51e6022c9a 100644
--- a/tests/manual/touch/CMakeLists.txt
+++ b/tests/manual/touch/CMakeLists.txt
@@ -27,51 +27,19 @@ qt_internal_add_resource(touch "qml"
FILES
${qml_resource_files}
)
-set_source_files_properties("../../../examples/quick/shared/Button.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/CheckBox.qml"
- PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/Label.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/LauncherList.qml"
- PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/SimpleLauncherDelegate.qml"
- PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/Slider.qml"
- PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/TextField.qml"
- PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
-)
-set_source_files_properties("../../../examples/quick/shared/images/back.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
-)
-set_source_files_properties("../../../examples/quick/shared/images/checkmark.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
-)
-set_source_files_properties("../../../examples/quick/shared/images/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
-)
-set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
-)
+
set(quick_shared_resource_files
- "Button.qml"
- "CheckBox.qml"
- "Label.qml"
- "LauncherList.qml"
- "SimpleLauncherDelegate.qml"
- "Slider.qml"
- "TextField.qml"
- "images/back.png"
- "images/checkmark.png"
- "images/next.png"
- "images/slider_handle.png"
+ "../../../examples/quick/shared/Button.qml"
+ "../../../examples/quick/shared/CheckBox.qml"
+ "../../../examples/quick/shared/Label.qml"
+ "../../../examples/quick/shared/LauncherList.qml"
+ "../../../examples/quick/shared/SimpleLauncherDelegate.qml"
+ "../../../examples/quick/shared/Slider.qml"
+ "../../../examples/quick/shared/TextField.qml"
+ "../../../examples/quick/shared/images/back.png"
+ "../../../examples/quick/shared/images/checkmark.png"
+ "../../../examples/quick/shared/images/next.png"
+ "../../../examples/quick/shared/images/slider_handle.png"
)
qt_internal_add_resource(touch "quick_shared"
diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf
index d1b7a5aad5..0b88fba86e 100644
--- a/tools/qmlcachegen/qtquickcompiler.prf
+++ b/tools/qmlcachegen/qtquickcompiler.prf
@@ -11,7 +11,7 @@ if(qtc_run|lupdate_run): return()
}
qtPrepareTool(QML_CACHEGEN, qmlcachegen, _FILTER)
-qtPrepareTool(QMAKE_RCC, rcc, _DEP)
+qtPrepareLibExecTool(QMAKE_RCC, rcc, _DEP)
isEmpty(QMLCACHE_DIR): QMLCACHE_DIR = .
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index de00522d48..9b0a9903b2 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -359,7 +359,7 @@ static void usage()
" ........ (remove AA_ShareOpenGLContexts)");
puts(" --desktop......................... Force use of desktop GL (AA_UseDesktopOpenGL)");
puts(" --gles............................ Force use of GLES (AA_UseOpenGLES)");
- puts(" --software........................ Force use of software rendering (AA_UseOpenGLES)");
+ puts(" --software........................ Force use of software rendering (AA_UseSoftwareOpenGL)");
puts(" --verbose......................... Print version and graphical diagnostics for the run-time");
#ifdef QT_WIDGETS_LIB
puts(" --apptype [gui|widgets] .......... Select which application class to use. Default is widgets.");