diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-15 11:41:19 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-15 11:41:19 +0200 |
| commit | b669a429d0b2d4c58d47a6b3513d12ca57cf8fb6 (patch) | |
| tree | 0316635d6ebebb2f0fe3667016828d291af0c419 /src/quicktemplates2/qquickcontainer.cpp | |
| parent | a8dd4f7d5b8f61b52a5aea7b8418a6a3961cae1e (diff) | |
| parent | 513363e940e0978931083544374bfe092107b9fb (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/ButtonGroup.qml
tests/auto/controls/data/tst_container.qml
tests/auto/menu/tst_menu.cpp
Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
Diffstat (limited to 'src/quicktemplates2/qquickcontainer.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcontainer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp index 9b8298c2..eaf18714 100644 --- a/src/quicktemplates2/qquickcontainer.cpp +++ b/src/quicktemplates2/qquickcontainer.cpp @@ -350,10 +350,14 @@ void QQuickContainerPrivate::itemSiblingOrderChanged(QQuickItem *) // reorder the restacked items (eg. by a Repeater) Q_Q(QQuickContainer); QList<QQuickItem *> siblings = effectiveContentItem(contentItem)->childItems(); + + int to = 0; for (int i = 0; i < siblings.count(); ++i) { QQuickItem* sibling = siblings.at(i); + if (QQuickItemPrivate::get(sibling)->isTransparentForPositioner()) + continue; int index = contentModel->indexOf(sibling, nullptr); - q->moveItem(index, i); + q->moveItem(index, to++); } } |