diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 14:41:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 14:41:35 +0200 |
| commit | 4653217c3f36e7914f2cc0573347a078dd11768f (patch) | |
| tree | 7c7e862bdec55ae7ea0e2b6816bda189febbe4d1 /src/quickwidgets | |
| parent | c5dcabeb6a07ed358e64f26cd8475bfe5daae0e4 (diff) | |
| parent | ad125bd18ef5c98a264b9e4fac258dd07511035d (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/quickwidgets/qquickwidget.cpp
Change-Id: I3e2326bc86a9d3adaafbe3830b75ce9afa81c45b
Diffstat (limited to 'src/quickwidgets')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 9cfec370f9..edaa1352ae 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -211,6 +211,8 @@ void QQuickWidgetPrivate::render(bool needsSync) if (!fbo) return; + Q_ASSERT(context); + if (!context->makeCurrent(offscreenSurface)) { qWarning("QQuickWidget: Cannot render due to failing makeCurrent()"); return; @@ -1089,7 +1091,10 @@ void QQuickWidget::showEvent(QShowEvent *) Q_D(QQuickWidget); d->updatePending = false; d->createContext(); - d->render(true); + if (d->offscreenWindow->openglContext()) + d->render(true); + else + triggerUpdate(); } /*! \reimp */ |