diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-17 12:30:37 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-17 12:30:37 +0200 |
commit | 4129028e25da7f42bacba68ce14ccf44d03ff59b (patch) | |
tree | 14961fd1c10d2952fff3f7aaeb45ae6ae6c0554f /src/quick/items | |
parent | 8f28229cec8ce8f52cefe760b86f3410786c201a (diff) | |
parent | f806d64249c6e961ab12270d3a045e9980e19cf4 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.12-merge-5.13
Change-Id: I9b1cfefda23febfb24282bc30bc38865499ec2f4
Diffstat (limited to 'src/quick/items')
-rw-r--r-- | src/quick/items/qquickitemview.cpp | 3 | ||||
-rw-r--r-- | src/quick/items/qquickshadereffectmesh_p.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index 95f1229b92..bbfbf6244c 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -1852,6 +1852,9 @@ void QQuickItemViewPrivate::layout() forceLayout = false; if (transitioner && transitioner->canTransition(QQuickItemViewTransitioner::PopulateTransition, true)) { + // Give the view one more chance to refill itself, + // in case its size is changed such that more delegates become visible after component completed + refill(); for (FxViewItem *item : qAsConst(visibleItems)) { if (!item->transitionScheduledOrRunning()) item->transitionNextReposition(transitioner, QQuickItemViewTransitioner::PopulateTransition, true); diff --git a/src/quick/items/qquickshadereffectmesh_p.h b/src/quick/items/qquickshadereffectmesh_p.h index 62a9798e40..79e05a5f9f 100644 --- a/src/quick/items/qquickshadereffectmesh_p.h +++ b/src/quick/items/qquickshadereffectmesh_p.h @@ -66,8 +66,8 @@ QT_REQUIRE_CONFIG(quick_shadereffect); QT_BEGIN_NAMESPACE -const char *qtPositionAttributeName(); -const char *qtTexCoordAttributeName(); +Q_QUICK_PRIVATE_EXPORT const char *qtPositionAttributeName(); +Q_QUICK_PRIVATE_EXPORT const char *qtTexCoordAttributeName(); class QSGGeometry; class QRectF; |