diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-16 09:34:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-16 09:34:50 +0200 |
| commit | 9d67bf6e9635505bd9523a3007f8e531f890c88f (patch) | |
| tree | a4b8a21313b4ac66bb1e96d90504a001863e2f22 /src/widgets/kernel | |
| parent | 12b96dbb81a1a7bc5ffc08c24942038b007985e9 (diff) | |
| parent | 5b3dfa470ed7ea40103daa785286ab71fb7aa230 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/corelib/tools/qlocale.qdoc
tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
Done-with: Edward Welbourne <edward.welbourne@qt.io>
Done-with: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I88e0757b2d020f0a244714c87844631df4b3fd13
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qopenglwidget.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp index cf15614680..374ea53726 100644 --- a/src/widgets/kernel/qopenglwidget.cpp +++ b/src/widgets/kernel/qopenglwidget.cpp @@ -1448,7 +1448,8 @@ bool QOpenGLWidget::event(QEvent *e) { // Special case: did grabFramebuffer() for a hidden widget that then became visible. // Recreate all resources since the context now needs to share with the TLW's. - d->reset(); + if (!qGuiApp->testAttribute(Qt::AA_ShareOpenGLContexts)) + d->reset(); } if (!d->initialized && !size().isEmpty() && window()->windowHandle()) { d->initialize(); |