diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-10 10:31:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-10 10:31:31 +0200 |
| commit | a4cef2531fc29d874cec9613e2d2ad7ccd5ad937 (patch) | |
| tree | 5539faab39cbb372a1530b115e9b9dc1e09492ae /src/core/api/qtwebenginecoreglobal.cpp | |
| parent | 4746bb904bf6841137d5b50357bf79c852bf5d06 (diff) | |
| parent | d35cd072c3f56aa285871a151adc30d9d81f3ea3 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
tests/auto/quick/qmltests/BLACKLIST
tests/auto/quick/qquickwebengineview/BLACKLIST
Change-Id: I29b68dec8692d0369a2dda56350ee62d3ad73e08
Diffstat (limited to 'src/core/api/qtwebenginecoreglobal.cpp')
| -rw-r--r-- | src/core/api/qtwebenginecoreglobal.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/api/qtwebenginecoreglobal.cpp b/src/core/api/qtwebenginecoreglobal.cpp index ad52d09ad..25d0bd3be 100644 --- a/src/core/api/qtwebenginecoreglobal.cpp +++ b/src/core/api/qtwebenginecoreglobal.cpp @@ -80,6 +80,8 @@ static QOpenGLContext *shareContext; static void deleteShareContext() { + if (qt_gl_global_share_context() == shareContext) + qt_gl_set_global_share_context(nullptr); delete shareContext; shareContext = 0; } |