diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-13 14:27:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-13 16:08:01 +0200 |
| commit | ff334fd57414be90ab6b40f91e16f0bdb1835762 (patch) | |
| tree | bb74d8217781394163870cb3399f0984136498c8 /src/widgets/kernel/qopenglwidget.cpp | |
| parent | ec4c93a852ddc1d1437232241de492ad20d4cbb1 (diff) | |
| parent | b5552bab40f2e165cf7196993ffc83785f4d8264 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/kernel/qopenglwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qopenglwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp index 10be5aef16..cbefb8a6bf 100644 --- a/src/widgets/kernel/qopenglwidget.cpp +++ b/src/widgets/kernel/qopenglwidget.cpp @@ -147,7 +147,7 @@ void QOpenGLWidget::paintGL() void QOpenGLWidget::updateGL() { Q_D(QOpenGLWidget); - if (d->uninitialized) + if (d->uninitialized || !d->surface()) return; makeCurrent(); |