summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2014-09-01 17:14:37 +0200
committerFriedemann Kleint <Friedemann.Kleint@digia.com>2014-09-02 11:14:30 +0200
commitda4a9b5deb8200621753252bc742702964ebf801 (patch)
treed9d33ca6d2808c8a5c393181941afb5bb5ebef1c
parent3916ffe17316d5a4c96f8a35ec755cc330b6ce08 (diff)
QWindowControllerItem: Always check for m_controlledWindow.
Prevent the example from crashing when implementation is available. Change-Id: I0ad40c2f5220ab07c4f3fb67d57997e4c78b6ff8 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
-rw-r--r--src/webview/qwindowcontrolleritem.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/webview/qwindowcontrolleritem.cpp b/src/webview/qwindowcontrolleritem.cpp
index 9af72c2..5abd624 100644
--- a/src/webview/qwindowcontrolleritem.cpp
+++ b/src/webview/qwindowcontrolleritem.cpp
@@ -61,7 +61,8 @@ void QWindowControllerItem::componentComplete()
void QWindowControllerItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
{
QQuickItem::geometryChanged(newGeometry, oldGeometry);
- m_controlledWindow->setGeometry(newGeometry.toRect());
+ if (m_controlledWindow)
+ m_controlledWindow->setGeometry(newGeometry.toRect());
}
void QWindowControllerItem::onWindowChanged(QQuickWindow* window)
@@ -74,5 +75,6 @@ void QWindowControllerItem::onWindowChanged(QQuickWindow* window)
void QWindowControllerItem::onVisibleChanged()
{
- m_controlledWindow->setVisible(isVisible());
+ if (m_controlledWindow)
+ m_controlledWindow->setVisible(isVisible());
}