diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-03-30 14:49:49 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-03-30 14:49:49 +0300 |
| commit | 4b265e42c09c547291bd18e5cc699d193375df5c (patch) | |
| tree | 15c1cb94b2ff992b1a10c5d6782623085cd1cce1 /src | |
| parent | b59cc643e4234f84ba7785c3f96a4394bcdc0995 (diff) | |
| parent | aed9b6cb78435f77b0ce72665b33c53c413d43fb (diff) | |
Merge tag 'v5.15.18-lts' into tqtc/lts-5.15-opensourcev5.15.18-lts-lgpl5.15
Qt 5.15.18-lts release
Change-Id: I832ae35e0d368725a9f6ef09eee6892e61f2bd00
Diffstat (limited to 'src')
| -rw-r--r-- | src/quicktemplates2/qquickswipeview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickswipeview.cpp b/src/quicktemplates2/qquickswipeview.cpp index 98d4d22b..06242f59 100644 --- a/src/quicktemplates2/qquickswipeview.cpp +++ b/src/quicktemplates2/qquickswipeview.cpp @@ -155,11 +155,10 @@ void QQuickSwipeViewPrivate::resizeItems() qmlWarning(item) << "SwipeView has detected conflicting anchors. Unable to layout the item."; item->setProperty("_q_QQuickSwipeView_warned", true); } - if (orientation == Qt::Horizontal) - item->setY(0); + item->setPosition({i * (contentItem->width() + spacing), 0}); else - item->setX(0); + item->setPosition({0, i * (contentItem->height() + spacing)}); item->setSize(QSizeF(contentItem->width(), contentItem->height())); } } |