diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 10:45:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 10:45:52 +0200 |
| commit | 22fab1502f562bccb3c16dde0288aa867e3b094a (patch) | |
| tree | 06f2c6ebbf9c3866084a26372cd32d378e21b501 /src/controls/Private/ScrollViewHelper.qml | |
| parent | 89f19ed0c65efa4df1fae6dbaac4486d3ef49f3a (diff) | |
| parent | 84a26f223b220a444dec2b43fffc71dab7e00d1d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I316bcbbc5308fda27728df15db1e780aa073da2a
Diffstat (limited to 'src/controls/Private/ScrollViewHelper.qml')
| -rw-r--r-- | src/controls/Private/ScrollViewHelper.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml index 4841eacee..066bc6cda 100644 --- a/src/controls/Private/ScrollViewHelper.qml +++ b/src/controls/Private/ScrollViewHelper.qml @@ -73,10 +73,12 @@ Item { function doLayout() { if (!recursionGuard) { recursionGuard = true + blockUpdates = true; scrollHelper.contentWidth = flickableItem !== null ? flickableItem.contentWidth : 0 scrollHelper.contentHeight = flickableItem !== null ? flickableItem.contentHeight : 0 scrollHelper.availableWidth = viewport.width scrollHelper.availableHeight = viewport.height + blockUpdates = false; recursionGuard = false } } |