diff options
| author | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-09-22 13:03:22 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-09-22 14:37:45 +0000 |
| commit | b07d3823a9a688f7ff1142c4f94884975afb6fc7 (patch) | |
| tree | 3b5b4d1b10f28670ee536c7cd33ad9eb2a99dc65 /src/quickwidgets | |
| parent | c63e7d36d43ffaba811971087bce1595a4aa9535 (diff) | |
Don't try to render directly without context in showEvent
Partially reverting
db525935ccd64d2c5c674f8a66dbe7096d754e9f
Task-number: QTCREATORBUG-15040
Change-Id: I6ced42a3d00bb1c419b2b0d4729bc4f5f3cf8bc7
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/quickwidgets')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index a848774ae9..e62cea514c 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -1072,7 +1072,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 */ |