From dc49175b06e1f7f4736b4c54b598b7167d794aff Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Fri, 25 Apr 2014 10:30:05 +0200 Subject: Do not assume that the webview only contains RWHV delegates This fixes an assertion for QML code like: WebEngineView { ... MouseArea { ... } } Change-Id: I7a9bfb801c81ea53c1cc830b44fe224a0b78db2d Reviewed-by: Zeno Albisser --- src/webengine/api/qquickwebengineview.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index e3838255e..20610150a 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -562,10 +562,9 @@ void QQuickWebEngineViewExperimental::goForwardTo(int index) void QQuickWebEngineView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { QQuickItem::geometryChanged(newGeometry, oldGeometry); - Q_FOREACH(QQuickItem *child, childItems()) { - Q_ASSERT(qobject_cast(child)); - child->setSize(newGeometry.size()); + if (qobject_cast(child)) + child->setSize(newGeometry.size()); } } -- cgit v1.2.3