qt/qtdeclarative.git, branch 6.5.2 Qt Declarative (Quick 2) Update dependencies on '6.5.2' in qt/qtdeclarative 2023-07-07T09:56:53+00:00 Qt Submodule Update Bot qt_submodule_update_bot@qt-project.org 2023-07-07T09:10:12+00:00 f289063ff19588a11dd79213632785cfda2909a0 Change-Id: Ia87526f526f919d36313cb50c95b2962dd121d11 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> 
Change-Id: Ia87526f526f919d36313cb50c95b2962dd121d11
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Update dependencies on '6.5.2' in qt/qtdeclarative 2023-06-30T03:37:03+00:00 Qt Submodule Update Bot qt_submodule_update_bot@qt-project.org 2023-06-30T03:36:55+00:00 12400f93f35f1f8954d11a67bdce426d7acf6b54 Change-Id: Ic1b27b17bef99f4d3ffa6c02e5558cc2ba4aeeeb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> 
Change-Id: Ic1b27b17bef99f4d3ffa6c02e5558cc2ba4aeeeb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Update dependencies on '6.5.2' in qt/qtdeclarative 2023-06-21T11:15:10+00:00 Qt Submodule Update Bot qt_submodule_update_bot@qt-project.org 2023-06-21T11:15:05+00:00 493004149df7ef4b0deed5bf227f473202be66c7 Change-Id: I39b121b298d7ea27fa4c74f62e6eba7d4124d4c9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> 
Change-Id: I39b121b298d7ea27fa4c74f62e6eba7d4124d4c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
MouseArea: don't ignore double-click events 2023-06-20T19:27:05+00:00 Shawn Rutledge shawn.rutledge@qt.io 2023-06-12T20:53:23+00:00 ff5baf76e5e7a35934fed8c043685c6834fe5271 In 72651a50f83aa72998822312c7b5c6235d28978f QQuickItem::mouseDoubleClickEvent() started to ignore double-clicks by default, which is consistent with the fact that it ignores the other pointer event types. But now we have to worry about subclasses that override mouseDoubleClickEvent() and call the base class implementation. d7fac6923a6d4e4ac7dc22458256366968acbdb3 tried to fix it but neglected the case when the MouseArea does not have an onDoubleClicked signal handling script. Since the QQuickMouseEvent object that we emit to QML won't be accepted if isDoubleClickConnected() is false, and since the code before 72651a50f83aa72998822312c7b5c6235d28978f was leaving the event accepted regardless of whether QQuickMouseEvent was accepted, we should not need to check it now either. Perhaps we should care about the case when onDoubleClicked sets accepted to false, but so far that doesn't seem very useful either: if you accept the press, a parent MouseArea will not see either the press or the double-click; if you ignore the press, you won't see the double-click, and a parent MouseArea will see both by default. tst_QQuickMouseArea::clickThrough() tests accepted = false in onDoubleClicked but not onPressed, and only with mouse, not touch. Added tst_QQuickMouseArea::doubleTap(); also moved the autotest from d7fac6923a6d4e4ac7dc22458256366968acbdb3 which has nothing to do with pointer handlers. Fixes: QTBUG-112434 Fixes: QTBUG-109393 Change-Id: I426827c20cdb2373e77744987dffba59cd941edc Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit 35b5511189f0f9dbb8cfd8b3ec97cca2c65b3e2e) Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> 
In 72651a50f83aa72998822312c7b5c6235d28978f
QQuickItem::mouseDoubleClickEvent() started to ignore double-clicks by
default, which is consistent with the fact that it ignores the other
pointer event types. But now we have to worry about subclasses that
override mouseDoubleClickEvent() and call the base class implementation.

d7fac6923a6d4e4ac7dc22458256366968acbdb3 tried to fix it but neglected
the case when the MouseArea does not have an onDoubleClicked signal
handling script. Since the QQuickMouseEvent object that we emit to QML
won't be accepted if isDoubleClickConnected() is false, and since the
code before 72651a50f83aa72998822312c7b5c6235d28978f was leaving the
event accepted regardless of whether QQuickMouseEvent was accepted, we
should not need to check it now either. Perhaps we should care about the
case when onDoubleClicked sets accepted to false, but so far that
doesn't seem very useful either: if you accept the press, a parent
MouseArea will not see either the press or the double-click; if you
ignore the press, you won't see the double-click, and a parent MouseArea
will see both by default. tst_QQuickMouseArea::clickThrough() tests
accepted = false in onDoubleClicked but not onPressed, and only with
mouse, not touch.

Added tst_QQuickMouseArea::doubleTap(); also moved the autotest from
d7fac6923a6d4e4ac7dc22458256366968acbdb3 which has nothing to do with
pointer handlers.

Fixes: QTBUG-112434
Fixes: QTBUG-109393
Change-Id: I426827c20cdb2373e77744987dffba59cd941edc
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
(cherry picked from commit 35b5511189f0f9dbb8cfd8b3ec97cca2c65b3e2e)
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Update dependencies on '6.5.2' in qt/qtdeclarative 2023-06-20T15:22:00+00:00 Qt Submodule Update Bot qt_submodule_update_bot@qt-project.org 2023-06-20T13:16:39+00:00 bf20d8cf12b5093bb7432d75f0adc2cff7c88ea8 Change-Id: Idde5fdc7b8529d03f9ea9a1d69290ebf6e5cc2d4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> 
Change-Id: Idde5fdc7b8529d03f9ea9a1d69290ebf6e5cc2d4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
QML: Try QML conversion before metatype conversion 2023-06-17T06:06:10+00:00 Ulf Hermann ulf.hermann@qt.io 2023-06-14T08:54:50+00:00 8e3b18734c60596a30a3f260197ef64218f0ae5a and guard against null gadgetPtr. This is what we get for uninitialized value type properties. Fixes: QTBUG-114494 Change-Id: I86ad23abcc4fec219017d1aad6b7add1c9a9af5d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit a2104034d404179f5fad98fd54a133b288ded47d) 
and guard against null gadgetPtr. This is what we get for uninitialized
value type properties.

Fixes: QTBUG-114494
Change-Id: I86ad23abcc4fec219017d1aad6b7add1c9a9af5d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit a2104034d404179f5fad98fd54a133b288ded47d)
QML: Allow creating constructible value types from variant objects 2023-06-17T06:06:07+00:00 Ulf Hermann ulf.hermann@qt.io 2023-06-14T06:32:13+00:00 c07cc979335216a034a3958780150d301e996f67 VariantObject as source for value type constructions should work the same way as other types. Change-Id: I35770adf0486b404673ee00800fb1d3e429a23cf Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 0bb0eeeb09580de8bccef996f9b4099fb7d1b482) 
VariantObject as source for value type constructions should work the
same way as other types.

Change-Id: I35770adf0486b404673ee00800fb1d3e429a23cf
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 0bb0eeeb09580de8bccef996f9b4099fb7d1b482)
Remove DA::deliverMatchingPointsToItem's second sendFilteredPointerEvent 2023-06-17T06:05:55+00:00 Shawn Rutledge shawn.rutledge@qt.io 2023-05-26T11:24:23+00:00 185888c6a82d6e11cd9f6614ef7616a28a87efc0 a2209698d3584a7c05d0c12aa61de050fe0e78fd added sendFilteredPointerEvent earlier in this function; it doesn't make sense to do it multiple times. Fixes: QTBUG-109995 Fixes: QTBUG-113653 Change-Id: I9a9cb36ba060ec924ec3467fff0d7b0e3d474da3 Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit 2cb75d3126f0514701475077c719b5ea5ad9864e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
a2209698d3584a7c05d0c12aa61de050fe0e78fd added sendFilteredPointerEvent
earlier in this function; it doesn't make sense to do it multiple times.

Fixes: QTBUG-109995
Fixes: QTBUG-113653
Change-Id: I9a9cb36ba060ec924ec3467fff0d7b0e3d474da3
Reviewed-by: Doris Verria <doris.verria@qt.io>
(cherry picked from commit 2cb75d3126f0514701475077c719b5ea5ad9864e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
CMake: Remove superfluous depfile in QML type registration 2023-06-16T04:10:09+00:00 Joerg Bornemann joerg.bornemann@qt.io 2023-06-13T06:29:52+00:00 ec5fee55ef1596db95d6f0ebcdf256b1ffd5da02 In _qt_internal_qml_type_registration we created a depfile that contained the *_metatypes.json files of target's SOURCES. This depfile was used in the custom command that produces ${target}_qmltyperegistration.cpp. It doesn't seem necessary to create a depfile, and one could use the DEPENDS option of add_custom_command instead. And indeed, commit ce950d619aef3ad0534544b2e029a6f025b256a5 added the same dependencies this way. Presumably, this was done to fix dependencies for older CMake versions and generators that do not support depfiles. This commit removes the creation of the depfile. This double dependency declaration was found when investigating QTBUG-106683, and it turns out that removing the depfile fixes the problem of re-generating ${target}_qmltyperegistration.cpp for Visual Studio generators. Task-number: QTBUG-106683 Change-Id: I6cf909dfb4a9b31b76599b7ad35ad6f595ca0891 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 470fee3217794c66f0eaf19f1a3cb229cfb85fc1) 
In _qt_internal_qml_type_registration we created a depfile that
contained the *_metatypes.json files of target's SOURCES.

This depfile was used in the custom command that produces
${target}_qmltyperegistration.cpp.

It doesn't seem necessary to create a depfile, and one could use the
DEPENDS option of add_custom_command instead. And indeed, commit
ce950d619aef3ad0534544b2e029a6f025b256a5 added the same dependencies
this way. Presumably, this was done to fix dependencies for older CMake
versions and generators that do not support depfiles.

This commit removes the creation of the depfile.

This double dependency declaration was found when investigating
QTBUG-106683, and it turns out that removing the depfile fixes the
problem of re-generating ${target}_qmltyperegistration.cpp for Visual
Studio generators.

Task-number: QTBUG-106683
Change-Id: I6cf909dfb4a9b31b76599b7ad35ad6f595ca0891
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 470fee3217794c66f0eaf19f1a3cb229cfb85fc1)
Update dependencies on '6.5.2' in qt/qtdeclarative 2023-06-15T11:34:02+00:00 Qt Submodule Update Bot qt_submodule_update_bot@qt-project.org 2023-06-14T13:20:35+00:00 0f7a3165ba48720cf414ca16735db8e92ad4f894 Change-Id: I3451e78b4560cf792ab3ecac6d83b542fa00f2fc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> 
Change-Id: I3451e78b4560cf792ab3ecac6d83b542fa00f2fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>