diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-02-08 10:42:39 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-02-08 10:42:54 +0100 |
| commit | 6ec0428db1d1dda0a74ead838aa799298e7a1306 (patch) | |
| tree | e5e68ac246b4120c262914c2a78ba26c18d98a0f /src/core/delegated_frame_node.cpp | |
| parent | f98de9e4d1631c17f4c3084baa1d1c8f2c69d906 (diff) | |
| parent | 9ff8eda0af657ad504318aebea5349b76fbb107a (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I0c3654ad097809fe10bcc6a15827a0af3006c4e6
Diffstat (limited to 'src/core/delegated_frame_node.cpp')
| -rw-r--r-- | src/core/delegated_frame_node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp index 4bc83163f..192109c6d 100644 --- a/src/core/delegated_frame_node.cpp +++ b/src/core/delegated_frame_node.cpp @@ -693,7 +693,7 @@ DelegatedFrameNode::DelegatedFrameNode() #if defined(USE_X11) && !defined(QT_NO_OPENGL) QOpenGLContext *currentContext = QOpenGLContext::currentContext() ; QOpenGLContext *sharedContext = qt_gl_global_share_context(); - if (!QOpenGLContext::areSharing(currentContext, sharedContext)) { + if (currentContext && sharedContext && !QOpenGLContext::areSharing(currentContext, sharedContext)) { static bool allowNotSharedContextWarningShown = true; if (allowNotSharedContextWarningShown) { allowNotSharedContextWarningShown = false; |