diff options
-rw-r--r-- | src/quick/items/qquickloader.cpp | 9 | ||||
-rw-r--r-- | tests/auto/quick/qquickloader/data/QTBUG_30183.qml | 12 | ||||
-rw-r--r-- | tests/auto/quick/qquickloader/tst_qquickloader.cpp | 17 |
3 files changed, 35 insertions, 3 deletions
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp index 0434c2af41..0d14f3e266 100644 --- a/src/quick/items/qquickloader.cpp +++ b/src/quick/items/qquickloader.cpp @@ -887,16 +887,19 @@ void QQuickLoader::setAsynchronous(bool a) void QQuickLoaderPrivate::_q_updateSize(bool loaderGeometryChanged) { Q_Q(QQuickLoader); - if (!item || updatingSize) + if (!item) return; - updatingSize = true; - if (loaderGeometryChanged && q->widthValid()) item->setWidth(q->width()); if (loaderGeometryChanged && q->heightValid()) item->setHeight(q->height()); + if (updatingSize) + return; + + updatingSize = true; + q->setImplicitSize(getImplicitWidth(), getImplicitHeight()); updatingSize = false; diff --git a/tests/auto/quick/qquickloader/data/QTBUG_30183.qml b/tests/auto/quick/qquickloader/data/QTBUG_30183.qml new file mode 100644 index 0000000000..1f626d969f --- /dev/null +++ b/tests/auto/quick/qquickloader/data/QTBUG_30183.qml @@ -0,0 +1,12 @@ +import QtQuick 2.0 + +Loader { + width: implicitWidth + height: implicitHeight + + sourceComponent: Rectangle { + color: "green" + implicitWidth: 240 + implicitHeight: 120 + } +} diff --git a/tests/auto/quick/qquickloader/tst_qquickloader.cpp b/tests/auto/quick/qquickloader/tst_qquickloader.cpp index d01e8aae52..50ded4d95a 100644 --- a/tests/auto/quick/qquickloader/tst_qquickloader.cpp +++ b/tests/auto/quick/qquickloader/tst_qquickloader.cpp @@ -126,6 +126,7 @@ private slots: void parented(); void sizeBound(); + void QTBUG_30183(); private: QQmlEngine engine; @@ -1126,6 +1127,22 @@ void tst_QQuickLoader::sizeBound() delete root; } +void tst_QQuickLoader::QTBUG_30183() +{ + QQmlComponent component(&engine, testFileUrl("/QTBUG_30183.qml")); + QQuickLoader *loader = qobject_cast<QQuickLoader*>(component.create()); + QVERIFY(loader != 0); + QCOMPARE(loader->width(), 240.0); + QCOMPARE(loader->height(), 120.0); + + // the loaded item must follow the size + QQuickItem *rect = qobject_cast<QQuickItem*>(loader->item()); + QVERIFY(rect); + QCOMPARE(rect->width(), 240.0); + QCOMPARE(rect->height(), 120.0); + + delete loader; +} QTEST_MAIN(tst_QQuickLoader) |