qt/qtdeclarative.git/src, branch 6.6.2 Qt Declarative (Quick 2) Fix polish issue in quick text edit 2024-01-22T16:01:03+00:00 Santhosh Kumar santhosh.kumar.selvaraj@qt.io 2023-11-09T13:05:22+00:00 4cf08f0757ad3e651bb090c6e449ca00b242cb93 The text edit didn't polish even after there is change in position offset, leading to alignment issues. During geometry change, the QQuickTextEdit calculates implicit size and base position offset, and then further requests a polish immediately afterwards. This sequence of update happens only if we have valid width or height set for text edit control. But in case we set width or height to undefined, there is a chance that this update would be missed. This patch removes the checking of widthValid() in QQuickTextEdit::geometryChange(), to allow those updates. The validation of width or height is already handled internally within updateSize(), so it shouldn't create an issue; and we still try to avoid emitting cursorRectangleChanged() too often. Amends 1770fa632facf2f1e4bb05e7689efc939d46cfef Task-number: QTBUG-117667 Task-number: QTBUG-25489 Pick-to: 6.5 Change-Id: Ia20cd06e78842f5edb0c395d6322a660f86f6b5e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit d84c1304112d2198a12e647fd44f57ee0e8dc437) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 3bff953242758365d81e278a6ee0f95f2deb6f1d) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> 
The text edit didn't polish even after there is change in position
offset, leading to alignment issues.

During geometry change, the QQuickTextEdit calculates implicit size
and base position offset, and then further requests a polish
immediately afterwards. This sequence of update happens only if we have
valid width or height set for text edit control. But in case we set
width or height to undefined, there is a chance that this update
would be missed.

This patch removes the checking of widthValid() in
QQuickTextEdit::geometryChange(), to allow those updates.
The validation of width or height is already handled internally
within updateSize(), so it shouldn't create an issue; and we still
try to avoid emitting cursorRectangleChanged() too often.

Amends 1770fa632facf2f1e4bb05e7689efc939d46cfef

Task-number: QTBUG-117667
Task-number: QTBUG-25489
Pick-to: 6.5
Change-Id: Ia20cd06e78842f5edb0c395d6322a660f86f6b5e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit d84c1304112d2198a12e647fd44f57ee0e8dc437)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 3bff953242758365d81e278a6ee0f95f2deb6f1d)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
QQuickWidget: accept touchpoint even if it has a passive grab 2024-01-22T13:15:46+00:00 Shawn Rutledge shawn.rutledge@qt.io 2024-01-04T07:07:05+00:00 0c5a04ee788dc480a1ebb930761dd2ba0e082f05 In the test case from QTBUG-113558, a QQuickWidget's only event-handling object is a TapHandler with its default gesturePolicy, so that on touch press, it gets pressed; but it was missing the touch release and getting stuck in pressed state. As explained in dc8f44b14501ecd4acc196f5138aeff3f7502d0a, widgets don't care about (exclusive or passive) grabbers, and rely on points being accepted to make the widget that received the TouchBegin an implicit grabber. If the only thing that happened in the Qt Quick scene in the QQuickWidget is that the touchpoint got a passive grab, it's still a kind of interaction, and we want to ensure that the TapHandler will see the release too, to avoid getting stuck. (This means that passive grabs are not passive from the perspective of widget event delivery: the TapHandler ends up excluding delivery of the touchpoint to other widgets, even though it didn't mean to. But hopefully nobody expects cooperation with touch-handling widgets underneath the Quick scene.) Fixes: QTBUG-113558 Pick-to: 6.5 Change-Id: Ided6247b43a2405dbfdf9d195bb45ceae4cf58fd Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 59b0b59090e2ff3f04bd15120720ee6a5b0c3f4b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 9f85654f7d4613ad184ffba950e53a82e61e9cc9) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> 
In the test case from QTBUG-113558, a QQuickWidget's only event-handling
object is a TapHandler with its default gesturePolicy, so that on touch
press, it gets pressed; but it was missing the touch release and getting
stuck in pressed state.

As explained in dc8f44b14501ecd4acc196f5138aeff3f7502d0a, widgets don't
care about (exclusive or passive) grabbers, and rely on points being
accepted to make the widget that received the TouchBegin an implicit
grabber. If the only thing that happened in the Qt Quick scene in the
QQuickWidget is that the touchpoint got a passive grab, it's still a
kind of interaction, and we want to ensure that the TapHandler will see
the release too, to avoid getting stuck. (This means that passive grabs
are not passive from the perspective of widget event delivery: the
TapHandler ends up excluding delivery of the touchpoint to other
widgets, even though it didn't mean to. But hopefully nobody expects
cooperation with touch-handling widgets underneath the Quick scene.)

Fixes: QTBUG-113558
Pick-to: 6.5
Change-Id: Ided6247b43a2405dbfdf9d195bb45ceae4cf58fd
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 59b0b59090e2ff3f04bd15120720ee6a5b0c3f4b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9f85654f7d4613ad184ffba950e53a82e61e9cc9)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Doc & Test: fix syntax of QSettings sub-groups 2024-01-22T08:47:14+00:00 Thiago Macieira thiago.macieira@intel.com 2024-01-18T16:38:35+00:00 9452e8d7dbb019aed1970795e46d1476833e89d4 These examples and .conf files were using two different syntax to create a subgroup. QSettings may not support one of them and is misbehaving. So let's use one syntax only and the one that it produces when writing the output. This code: s.beginGroup(u"Material"); s.beginGroup(u"Font"); s.setValue("Family", "Open Sans"); s.setValue("PixelSize", 20); Produces: [Material] Font\Family=Open Sans Font\PixelSize=20 Fixes: QTBUG-121035 Change-Id: I76ffba14ece04f24b43efffd17ab7ea941910c19 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit e8e818df993113f7c330f8215dccc24c2790f7c5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 450fdee836866cfc8f62f1bc829f27223946f1da) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> 
These examples and .conf files were using two different syntax to create
a subgroup. QSettings may not support one of them and is misbehaving. So
let's use one syntax only and the one that it produces when writing the
output.

This code:

    s.beginGroup(u"Material");
    s.beginGroup(u"Font");
    s.setValue("Family", "Open Sans");
    s.setValue("PixelSize", 20);

Produces:

 [Material]
 Font\Family=Open Sans
 Font\PixelSize=20

Fixes: QTBUG-121035
Change-Id: I76ffba14ece04f24b43efffd17ab7ea941910c19
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit e8e818df993113f7c330f8215dccc24c2790f7c5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 450fdee836866cfc8f62f1bc829f27223946f1da)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
QmlCompiler: Use a hash set for the list of conversions 2024-01-21T07:14:35+00:00 Ulf Hermann ulf.hermann@qt.io 2024-01-18T09:04:17+00:00 2c460deadc08da2a43da7fc2b96452477c74fafd There can be a lot of them and we don't want quadratic behavior. It might be possible to further improve on this using e.g. sorted lists and algorithms provided by the STL. However, such an implementation would be more complicated and would require weighing several trade-offs. Pick-to: 6.5 Fixes: QTBUG-121139 Change-Id: I717b49bd4af97abcaae9ae78d1e1b31d5d462952 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit af212e5e4edb73978298cd030b15deb8d8c28183) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 2108e416eabc68c0136faa5041d80866ce1da716) 
There can be a lot of them and we don't want quadratic behavior. It might be possible to further improve on this using e.g. sorted lists
and algorithms provided by the STL. However, such an implementation
would be more complicated and would require weighing several trade-offs.

Pick-to: 6.5
Fixes: QTBUG-121139
Change-Id: I717b49bd4af97abcaae9ae78d1e1b31d5d462952
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit af212e5e4edb73978298cd030b15deb8d8c28183)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 2108e416eabc68c0136faa5041d80866ce1da716)
AnimatedImage: avoid loading the same web source in parallel 2024-01-18T22:18:44+00:00 Vladimir Belyavsky belyavskyv@gmail.com 2024-01-05T17:03:46+00:00 4b4af2a02cd85b2e4acf5940b256ff84817edb56 QQuickAnimatedImage::load() is an overloaded method that is called implicitly from QQuickImage/QQuickImageBase whenever an user changes basic properties such as fillMode, mipmap, sourceSize, etc. In the case of a web source, this can cause a real problem with loading failure. For example, when the user changes `fillMode` immediately after setting the `source` property, like: anim.source = <some web image> anim.fillMode = Image.PreserveAspectFit Currently the code above lead to the error "QML AnimatedImage: Error Reading Animated Image File". This happens because QQAI::load() initiates a new network request at the same time that one is already in progress. And when the first reply finishes, we try to read data from the new reply that is not ready yet. To fix this, we can simply ignore and do nothing on QQAI::load() if there is already active network request (i.e. d->reply is not nullptr). This has no effect on the actual source change, since we explicitly remove and nullify the active reply in QQAI::setSource(). By this change we also fix potential memory leak, because the old reply was previously not destroyed properly in QQuickAnimatedImage::load(). Fixes: QTBUG-120555 Pick-to: 6.5 Change-Id: I28f964b51c059855c04a4c80bdce127b3e9974a7 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit fec4ac12e7a60dbd83a2b9c8bb75ad0f88d13a6a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a9b0aec18ca5d22537d350fafd795ae8d30d4053) 
QQuickAnimatedImage::load() is an overloaded method that is called implicitly from QQuickImage/QQuickImageBase whenever an user changes basic properties such as fillMode, mipmap, sourceSize, etc.

In the case of a web source, this can cause a real problem with
loading failure. For example, when the user changes `fillMode`
immediately after setting the `source` property, like:

 anim.source = <some web image>
 anim.fillMode = Image.PreserveAspectFit

Currently the code above lead to the error "QML AnimatedImage: Error
Reading Animated Image File". This happens because QQAI::load()
initiates a new network request at the same time that one is already
in progress. And when the first reply finishes, we try to read data from the new reply that is not ready yet.

To fix this, we can simply ignore and do nothing on QQAI::load() if there is already active network request (i.e. d->reply is not
nullptr). This has no effect on the actual source change, since we explicitly remove and nullify the active reply in QQAI::setSource().

By this change we also fix potential memory leak, because the old reply
was previously not destroyed properly in QQuickAnimatedImage::load().

Fixes: QTBUG-120555
Pick-to: 6.5
Change-Id: I28f964b51c059855c04a4c80bdce127b3e9974a7
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit fec4ac12e7a60dbd83a2b9c8bb75ad0f88d13a6a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit a9b0aec18ca5d22537d350fafd795ae8d30d4053)
TableView: don't clear existing selection 2024-01-18T20:55:21+00:00 Richard Moe Gustavsen richard.gustavsen@qt.io 2024-01-08T15:27:53+00:00 77a448c87f175aeac63ccf813599ca035220ce40 If TableView.selectionMode is ExtendedSelection, and the user starts a second selection (by pressing ControlModifier while dragging), the second selection can end up clearing the first if they temporarily overlap. This change will make sure that we save the current selection when a new extended selection starts, to ensure that a cell will stay selected if either the first or the second selection selects it. Fixes: QTBUG-121132 Change-Id: I7bd6eeb4b0cc2372aa683c3c71d8e1b25c5ef17e Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> (cherry picked from commit 6eb26fe88648265ff4f7f1508280a24bb2cb900d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit ac4ff59e7be0d80ae5f278491207c5776a080a50) 
If TableView.selectionMode is ExtendedSelection, and the
user starts a second selection (by pressing ControlModifier
while dragging), the second selection can end up clearing
the first if they temporarily overlap.

This change will make sure that we save the current selection
when a new extended selection starts, to ensure that a cell will
stay selected if either the first or the second selection selects
it.

Fixes: QTBUG-121132
Change-Id: I7bd6eeb4b0cc2372aa683c3c71d8e1b25c5ef17e
Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io>
(cherry picked from commit 6eb26fe88648265ff4f7f1508280a24bb2cb900d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit ac4ff59e7be0d80ae5f278491207c5776a080a50)
CMake: Fix NO_LINT option to work properly 2024-01-18T20:55:21+00:00 Alexandru Croitor alexandru.croitor@qt.io 2024-01-17T16:46:12+00:00 8b0409d8002b6fea540eb4974a880ecf68acd18a Even if NO_LINT was passed to qt_add_qml_module, qt_target_qml_sources would read the property set by qt_add_qml_module too late, and would still create a lint target. Make sure we read the property earlier. Pick-to: 6.5 Fixes: QTBUG-121206 Change-Id: I409b37cab6dc0583458142ff00447d4191b4ff61 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 3fb693d7dad9070d7c574fc320b35e5ca6a5d2c7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 48a5ebd140b17b1ac9ef8a579ba49566db6bb88c) 
Even if NO_LINT was passed to qt_add_qml_module, qt_target_qml_sources
would read the property set by qt_add_qml_module too late, and would
still create a lint target.

Make sure we read the property earlier.

Pick-to: 6.5
Fixes: QTBUG-121206
Change-Id: I409b37cab6dc0583458142ff00447d4191b4ff61
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 3fb693d7dad9070d7c574fc320b35e5ca6a5d2c7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 48a5ebd140b17b1ac9ef8a579ba49566db6bb88c)
Doc: Replace Qt 5 QtGraphicalEffects code snippet with Qt 6 MultiEffect 2024-01-18T20:55:19+00:00 Andreas Eliasson andreas.eliasson@qt.io 2024-01-17T09:47:50+00:00 22b81f1bb8f87092159e9f99f481428447913063 Qt Graphical Effects was deprecated in Qt 6 and replaced with the MultiEffect type. Fix code snippets in Qt 6 documentation to use the MultiEffect QML type instead of the deprecated Qt Graphical Effects type. Fixes: QTBUG-119992 Pick-to: 6.5 Change-Id: I27c11ed013880978656f86b6322bf3e4bfa18812 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit a95df6a234e4f6e08975eed71b823d41b98542f6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 134261baf97e4bcdd69dcff27a63551876aeb52c) 
Qt Graphical Effects was deprecated in Qt 6 and replaced with the
MultiEffect type. Fix code snippets in Qt 6 documentation to use the
MultiEffect QML type instead of the deprecated Qt Graphical Effects
type.

Fixes: QTBUG-119992
Pick-to: 6.5
Change-Id: I27c11ed013880978656f86b6322bf3e4bfa18812
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit a95df6a234e4f6e08975eed71b823d41b98542f6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 134261baf97e4bcdd69dcff27a63551876aeb52c)
QtQml: Do not call signal handlers on half-deleted objects 2024-01-18T13:49:11+00:00 Ulf Hermann ulf.hermann@qt.io 2024-01-17T08:01:20+00:00 c24716c7fe465b6a8394211e90e95fb34ef5f990 Fixes: QTBUG-121022 Change-Id: Icdefd6bef4906700d88eca47c09d0abe54f1eec9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 9d8e78a2f2661d8a1f2909bfe8a20e15f833af2e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 5d53ea98449597dbbad38752b4aac80e0aedb341) 
Fixes: QTBUG-121022
Change-Id: Icdefd6bef4906700d88eca47c09d0abe54f1eec9
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 9d8e78a2f2661d8a1f2909bfe8a20e15f833af2e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 5d53ea98449597dbbad38752b4aac80e0aedb341)
Correct merge reorder issue with the revert patch 2024-01-18T08:09:16+00:00 Santhosh Kumar santhosh.kumar.selvaraj@qt.io 2024-01-17T11:39:54+00:00 cddf2b0b4cae7ea455f944f55c5ee248fcf1500e This is a follow-up patch to revert the complete change made in patch 9ad9d05f26184a79ad3fe09abdc662949088d19d and d85de8da6011731e3ff31ae1361e71fecaedb0be. There are separate patches made to revert these changes but the order in which these revert patches merged (in 6.7 branch) was incorrect. This further triggers issue in other branches. This patch fixes the issue happened due to merge reordering. Its to be noted that patch d85de8da6011731e3ff31ae1361e71fecaedb0be not been merged to 6.6 and 6.5 branches but still this patch is required to revert the complete change in those branches. Pick-to: 6.5 Change-Id: I875b13741bccc36c4a4892e5d71b6c7aa7e3b031 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> (cherry picked from commit 2b925eb9b925665afb83cb11addbc9cb7319ae41) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 
This is a follow-up patch to revert the complete change made in patch
9ad9d05f26184a79ad3fe09abdc662949088d19d and
d85de8da6011731e3ff31ae1361e71fecaedb0be.

There are separate patches made to revert these changes but the order in
which these revert patches merged (in 6.7 branch) was incorrect. This
further triggers issue in other branches. This patch fixes the issue
happened due to merge reordering.

Its to be noted that patch d85de8da6011731e3ff31ae1361e71fecaedb0be not
been merged to 6.6 and 6.5 branches but still this patch is required to
revert the complete change in those branches.

Pick-to: 6.5
Change-Id: I875b13741bccc36c4a4892e5d71b6c7aa7e3b031
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
(cherry picked from commit 2b925eb9b925665afb83cb11addbc9cb7319ae41)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>