qt/qtdeclarative.git, branch v5.15.2 Qt Declarative (Quick 2) Merge "Add changes file for Qt 5.15.2" 2020-11-05T09:21:11+00:00 Antti Kokko antti.kokko@qt.io 2020-10-27T08:02:12+00:00 104eae5b17b0ec700391e9539ee3a4f638588194 






Add changes file for Qt 5.15.2
2020-11-05T07:18:32+00:00

Antti Kokko
antti.kokko@qt.io

2020-10-27T08:02:12+00:00

eaa6459984b723cb48b2617fcabab844109c16fa

Pick-to: dev 5.15
Change-Id: I5bf32a9ba9f5e3f10f23ffe78bceecdfaa23fbc2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>





Pick-to: dev 5.15
Change-Id: I5bf32a9ba9f5e3f10f23ffe78bceecdfaa23fbc2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>







Revert "qquickloader: Free memory of loaded components after source change"
2020-11-02T06:01:30+00:00

Maximilian Goldstein
max.goldstein@qt.io

2020-10-29T15:25:23+00:00

1aeca03e14fd6ce81522df1714bbb294650a66de

This reverts commit c5085eb8905f1a3c070f866746110980e84be271.
It can cause crashes and only fixes an edge case that can't
be encountered during normal usage.

Change-Id: Ia265f0d6716b59a0f483e5a114b3f3b1a76fe898
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 0fa6091b1076bc3cc58303ff00d43efdad32b8ad)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>





This reverts commit c5085eb8905f1a3c070f866746110980e84be271.
It can cause crashes and only fixes an edge case that can't
be encountered during normal usage.

Change-Id: Ia265f0d6716b59a0f483e5a114b3f3b1a76fe898
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 0fa6091b1076bc3cc58303ff00d43efdad32b8ad)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>







Inline components: Fix custom parser support
2020-10-28T12:46:51+00:00

Fabian Kosmale
fabian.kosmale@qt.io

2020-10-27T15:54:01+00:00

cdfb593985496f70b33e295f35b84c8dcf494cc2

Fixes: QTBUG-85713
Fixes: QTBUG-87464
Change-Id: I5c190ad2d02190de90260042cc06e51c1da01c63
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 2425cd478138c52694aaa20b7f7eb4a91d97b51c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>





Fixes: QTBUG-85713
Fixes: QTBUG-87464
Change-Id: I5c190ad2d02190de90260042cc06e51c1da01c63
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 2425cd478138c52694aaa20b7f7eb4a91d97b51c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>







TableView: ensure we rebuild the sync view, even when flicking on a sync view child
2020-10-26T10:58:30+00:00

Richard Moe Gustavsen
richard.gustavsen@qt.io

2020-10-19T21:25:22+00:00

0135942bb3dffeed15aa78ca01f480575d85acef

When two table views are connect through the syncView property, both
views will flick when you flick on either of them. This also means
that if you fast-flick more than a page on the sync view child, the
sync view needs to rebuild, like if you did the fast-flick directly
on the sync view. Because we updated the sync view's viewportRect too
soon while fast-flicking on the the sync child, we didn't detect that
it was a fast-flick, and that a rebuild was needed. The result is
that you could sometimes end up with the views getting out-of-sync.

This patch will allow TableView to only move the viewport without
updating the internal viewportRect while flicking. The viewportRect
will instead be sync-ed at a later point, like we do when you flick
on the sync view directly. This will ensure that we rebuild if
needed, also while fast-flicking on the child view.

Task-number: QTBUG-87821
Change-Id: Ifc74473eb43406acaa8e24880066fb4ca89d3a4e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit b5501e9043cabcbf74d3d53b424ece5deb706a27)





When two table views are connect through the syncView property, both
views will flick when you flick on either of them. This also means
that if you fast-flick more than a page on the sync view child, the
sync view needs to rebuild, like if you did the fast-flick directly
on the sync view. Because we updated the sync view's viewportRect too
soon while fast-flicking on the the sync child, we didn't detect that
it was a fast-flick, and that a rebuild was needed. The result is
that you could sometimes end up with the views getting out-of-sync.

This patch will allow TableView to only move the viewport without
updating the internal viewportRect while flicking. The viewportRect
will instead be sync-ed at a later point, like we do when you flick
on the sync view directly. This will ensure that we rebuild if
needed, also while fast-flicking on the child view.

Task-number: QTBUG-87821
Change-Id: Ifc74473eb43406acaa8e24880066fb4ca89d3a4e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit b5501e9043cabcbf74d3d53b424ece5deb706a27)







Fix compiler warning: mark overrides as such, remove virtual
2020-10-23T14:38:28+00:00

Volker Hilsheimer
volker.hilsheimer@qt.io

2020-10-23T10:58:18+00:00

2fe4bbd0aef2efb825802ad21a93c43323e1bb87

Change-Id: I77bd88eb0f277c139fd296c1dafa8b09517a3064
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit c31c4068f87bb65328b4d25ca0c8d428ab8f74a6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>





Change-Id: I77bd88eb0f277c139fd296c1dafa8b09517a3064
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit c31c4068f87bb65328b4d25ca0c8d428ab8f74a6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>







Update and activate tst_animators
2020-10-23T08:50:08+00:00

Shawn Rutledge
shawn.rutledge@qt.io

2020-10-19T19:11:22+00:00

9ebb64735775974bb376a3f58ba9fd3bba72a968

Amends a0f8be4021caa9bb5055923f0eea3bee0e345235; it's not clear if
there's any reason we haven't been running this test all these years.
But we need to use testFileUrl() for loading QML files, and some
additional updates make it more like the other tests.

Change-Id: I3ddcc993c4536c2d4d751a37c0425943c7d86766
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit ec9d125f553c073ec7a431114a568eaeb6534b63)
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>





Amends a0f8be4021caa9bb5055923f0eea3bee0e345235; it's not clear if
there's any reason we haven't been running this test all these years.
But we need to use testFileUrl() for loading QML files, and some
additional updates make it more like the other tests.

Change-Id: I3ddcc993c4536c2d4d751a37c0425943c7d86766
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit ec9d125f553c073ec7a431114a568eaeb6534b63)
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>







TableView: ensure we update content size upon model changes
2020-10-22T15:04:16+00:00

Richard Moe Gustavsen
richard.gustavsen@qt.io

2020-10-19T09:30:00+00:00

03d3d26f6e0cc1698b3a16b0695dcc71420219e8

For tables of non-trivial sizes, we usually don't know what the
content size will be unless we load all rows and columns, which
we simply cannot do. Because of this, we have up till now chosen
a strategy where we normally just calculate a predicted content
size up-front, when we table is built, and afterwards just stick
to that prediction.

This strategy works for big tables that fills more than one size
of the viewport, and if the number of rows and column in the model
stays around the same. But for tables that start off smaller than
the viewport, and later expands to grow out of it, it simply fails.
And the failure is such that the tableview can get stuck, with no
way way for the user to flick around to see the rest of the contents.

An example is TreeView that might only show the root node at
start-up, but as you start to expand the tree, it will quickly add
more rows than what fits inside the viewport. And in that case, the
contentHeight will be totally off, and in turn, make the scrollbar
be based on wrong values, and sometimes not work at all (e.g if
it has the flag Flickable::StopAtBounds).

This patch will change the implementation so that we recalculate
the content size whenever it should logially change. That is, if
e.g the model add or remove rows and columns, or if you change
spacing. This still doesn't mean that contentWidth/Height reports
the correct size of the table, but at least it will be a better
guestimate for smaller tables, and at the same time, work
together with Flickable and ScrollBars.

Fixes: QTBUG-87680
Change-Id: Ie2d2e7c1f1519dc7a5d5269a6d25e34cf441b3fe
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit dac2c8aec4917742aed6e311cf542dc37da60809)





For tables of non-trivial sizes, we usually don't know what the
content size will be unless we load all rows and columns, which
we simply cannot do. Because of this, we have up till now chosen
a strategy where we normally just calculate a predicted content
size up-front, when we table is built, and afterwards just stick
to that prediction.

This strategy works for big tables that fills more than one size
of the viewport, and if the number of rows and column in the model
stays around the same. But for tables that start off smaller than
the viewport, and later expands to grow out of it, it simply fails.
And the failure is such that the tableview can get stuck, with no
way way for the user to flick around to see the rest of the contents.

An example is TreeView that might only show the root node at
start-up, but as you start to expand the tree, it will quickly add
more rows than what fits inside the viewport. And in that case, the
contentHeight will be totally off, and in turn, make the scrollbar
be based on wrong values, and sometimes not work at all (e.g if
it has the flag Flickable::StopAtBounds).

This patch will change the implementation so that we recalculate
the content size whenever it should logially change. That is, if
e.g the model add or remove rows and columns, or if you change
spacing. This still doesn't mean that contentWidth/Height reports
the correct size of the table, but at least it will be a better
guestimate for smaller tables, and at the same time, work
together with Flickable and ScrollBars.

Fixes: QTBUG-87680
Change-Id: Ie2d2e7c1f1519dc7a5d5269a6d25e34cf441b3fe
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit dac2c8aec4917742aed6e311cf542dc37da60809)







qquickloader: Free memory of loaded components after source change
2020-10-21T16:29:11+00:00

Fabian Kosmale
fabian.kosmale@qt.io

2020-10-19T14:07:54+00:00

d62437be7743bbb5d7697bf2d3bf4b74cc79223e

Since we cannot be sure when the event loop that would usually
handle deferred deletions will run the next time we have to delete these
components immediately otherwise we might run out of memory.

Fixes: QTBUG-86676
Done-with: Maximilian Goldstein <max.goldstein@qt.io>
Change-Id: I01d74f7eea442f8ba240dd66a4cedd6316fbeec2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit c5085eb8905f1a3c070f866746110980e84be271)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>





Since we cannot be sure when the event loop that would usually
handle deferred deletions will run the next time we have to delete these
components immediately otherwise we might run out of memory.

Fixes: QTBUG-86676
Done-with: Maximilian Goldstein <max.goldstein@qt.io>
Change-Id: I01d74f7eea442f8ba240dd66a4cedd6316fbeec2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit c5085eb8905f1a3c070f866746110980e84be271)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>







Fix OPTIONS argument of qtquick_compiler_add_resources
2020-10-21T15:40:14+00:00

Joerg Bornemann
joerg.bornemann@qt.io

2020-10-21T13:43:51+00:00

fc95c09b06ff6dcdf72511a06c3c64bfc59261f1

The OPTIONS argument is stored in the variable rcc_options, not options.

Pick-to: 5.12
Fixes: QTBUG-87721
Change-Id: Ibd04ada18461fa1c052be46f3c7aa9cb28f31e8f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>





The OPTIONS argument is stored in the variable rcc_options, not options.

Pick-to: 5.12
Fixes: QTBUG-87721
Change-Id: Ibd04ada18461fa1c052be46f3c7aa9cb28f31e8f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>