diff options
| -rw-r--r-- | src/quicklayouts/qquickgridlayoutengine_p.h | 2 | ||||
| -rw-r--r-- | src/quicklayouts/qquicklinearlayout.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/quick/qquicklayouts/data/tst_gridlayout.qml | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/quicklayouts/qquickgridlayoutengine_p.h b/src/quicklayouts/qquickgridlayoutengine_p.h index a59679761d..047d214655 100644 --- a/src/quicklayouts/qquickgridlayoutengine_p.h +++ b/src/quicklayouts/qquickgridlayoutengine_p.h @@ -86,6 +86,8 @@ public: } } + inline virtual QString toString() const override { return QDebug::toString(m_item); } + QQuickItem *layoutItem() const { return m_item; } QQuickItem *m_item; diff --git a/src/quicklayouts/qquicklinearlayout.cpp b/src/quicklayouts/qquicklinearlayout.cpp index 25c5e62632..2fa3c7e820 100644 --- a/src/quicklayouts/qquicklinearlayout.cpp +++ b/src/quicklayouts/qquicklinearlayout.cpp @@ -811,6 +811,7 @@ void QQuickGridLayout::insertLayoutItems() layoutItem->setStretchFactor(hStretch, Qt::Horizontal); if (vStretch >= 0) layoutItem->setStretchFactor(vStretch, Qt::Vertical); + d->engine.insertItem(layoutItem, -1); } } diff --git a/tests/auto/quick/qquicklayouts/data/tst_gridlayout.qml b/tests/auto/quick/qquicklayouts/data/tst_gridlayout.qml index d03a8006b4..f311cc34d6 100644 --- a/tests/auto/quick/qquicklayouts/data/tst_gridlayout.qml +++ b/tests/auto/quick/qquicklayouts/data/tst_gridlayout.qml @@ -208,7 +208,7 @@ Item { } function test_flowLeftToRightDefaultPositions() { - ignoreWarning("QGridLayoutEngine::addItem: Cell (1, 0) already taken"); + ignoreWarning(/QGridLayoutEngine::addItem: Can't add .* at cell \(1, 0\) because it's already taken by .*/); var layout = createTemporaryObject(layout_flowLeftToRightDefaultPositions_Component, container); compare(layout.implicitWidth, 40); compare(layout.children[0].x, 0); |