diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-22 19:59:08 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-22 19:59:08 +0100 |
commit | 2a1292b9168d40e71c9e67a41d3b8c499b8e222b (patch) | |
tree | 071014337919d63a62718ea6979fd48775ad61df /src/gui/kernel/qopenglcontext.cpp | |
parent | 2be7746e0922fa404da567fd0bc0cbc00c6215cb (diff) | |
parent | c204f6e417fe9b10df29e0ba00c7a94e0aa52cef (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I4b56ce8c76729d9fc60995564299f8f27336fcde
Diffstat (limited to 'src/gui/kernel/qopenglcontext.cpp')
-rw-r--r-- | src/gui/kernel/qopenglcontext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index 4847a62b0f..acb6c3fe94 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -1235,7 +1235,8 @@ void QOpenGLContext::deleteQGLContext() Returns the platform-specific handle for the OpenGL implementation that is currently in use. (for example, a HMODULE on Windows) - On platforms that do not use dynamic GL switch the return value is null. + On platforms that do not use dynamic GL switching, the return value + is \nullptr. The library might be GL-only, meaning that windowing system interface functions (for example EGL) may live in another, separate library. |