diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:40 +0200 |
| commit | 4b77b044b3e0a27f9f7501e6a78121afc270619c (patch) | |
| tree | e73fbe5865c60494f3b3f847b7385e76d05e3804 /src/controls/Private | |
| parent | c24118685d6eb4cacf5f6af96215ba89ecc28604 (diff) | |
| parent | a2963fe162921c0abb2116aec6263204954030ad (diff) | |
| download | qtquickcontrols-4b77b044b3e0a27f9f7501e6a78121afc270619c.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: Ic78345c599719f3dd80b1d6a6004d46a085da4af
Diffstat (limited to 'src/controls/Private')
| -rw-r--r-- | src/controls/Private/ScrollViewHelper.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml index 9e4f97e7..4841eace 100644 --- a/src/controls/Private/ScrollViewHelper.qml +++ b/src/controls/Private/ScrollViewHelper.qml @@ -73,10 +73,10 @@ Item { function doLayout() { if (!recursionGuard) { recursionGuard = true - scrollHelper.availableWidth = viewport.width - scrollHelper.availableHeight = viewport.height scrollHelper.contentWidth = flickableItem !== null ? flickableItem.contentWidth : 0 scrollHelper.contentHeight = flickableItem !== null ? flickableItem.contentHeight : 0 + scrollHelper.availableWidth = viewport.width + scrollHelper.availableHeight = viewport.height recursionGuard = false } } |