diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-04-25 10:30:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-25 14:52:46 +0200 |
| commit | dc49175b06e1f7f4736b4c54b598b7167d794aff (patch) | |
| tree | d7fe26eef859c8565385c40d6b7a62bc47809989 /src/webengine | |
| parent | 94e445424a6b447d947a8e51bf8ce05f309c6879 (diff) | |
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 <zeno.albisser@digia.com>
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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<RenderWidgetHostViewQtDelegateQuick *>(child)); - child->setSize(newGeometry.size()); + if (qobject_cast<RenderWidgetHostViewQtDelegateQuick *>(child)) + child->setSize(newGeometry.size()); } } |