diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-08 21:52:42 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-08 21:52:42 +0100 |
| commit | c767e996ca4d6372fe14748874777ac8b13e9ec3 (patch) | |
| tree | 94cbac2f94416cc9c7626a21414460c50f1c21f0 /src/templates/qquickswipeview.cpp | |
| parent | d579c1c8aef5b497801d0484461182ed04fe4aa0 (diff) | |
| parent | 01d076d0e81e5d8825fcdc16544f826530bd5ace (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/controls/data/tst_combobox.qml
Change-Id: I9d0c9a8adbe098720f0766e38db8aa2be4ed7408
Diffstat (limited to 'src/templates/qquickswipeview.cpp')
| -rw-r--r-- | src/templates/qquickswipeview.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/templates/qquickswipeview.cpp b/src/templates/qquickswipeview.cpp index ec51da49..63dc525f 100644 --- a/src/templates/qquickswipeview.cpp +++ b/src/templates/qquickswipeview.cpp @@ -142,6 +142,7 @@ void QQuickSwipeView::geometryChanged(const QRectF &newGeometry, const QRectF &o void QQuickSwipeView::itemAdded(int, QQuickItem *item) { Q_D(QQuickSwipeView); + QQuickItemPrivate::get(item)->setCulled(true); // QTBUG-51078, QTBUG-51669 if (isComponentComplete()) item->setSize(QSizeF(d->contentItem->width(), d->contentItem->height())); } |