aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@sletta.org>2014-09-17 10:49:20 +0200
committerGunnar Sletta <gunnar@sletta.org>2014-09-17 11:02:04 +0200
commitacd0f6244904213f581a55bd416483c5d56ccfb4 (patch)
tree691f70e2e5e5fd6a653b2b6ad8bff2e40bb24fc3 /src/quick
parentc137c6f07bde37f113268581b2c7394dfee22f0d (diff)
Protect QQuickWindow::openglContext against not having a context.
Change-Id: I3d5087d9c322ee5ee3325858ee717161fd7801a3 Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/items/qquickwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 1cb88fdc49..e1ee368f96 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -2922,7 +2922,7 @@ void QQuickWindow::setTransientParent_helper(QQuickWindow *window)
QOpenGLContext *QQuickWindow::openglContext() const
{
Q_D(const QQuickWindow);
- return d->context->openglContext();
+ return d->context ? d->context->openglContext() : 0;
}
/*!