diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 01:00:39 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-01-28 14:17:01 +0000 |
| commit | ef442327b8a4122fe46462e95a0537ec5ac53cb6 (patch) | |
| tree | c0a0267ab4175d520a27c1dc7b589af220e77c48 /src/gui/kernel/qopenglcontext.cpp | |
| parent | 07a576cc6171fd78d7fb3a0332349c2fa6127460 (diff) | |
| parent | 558fc903acc610769279da2737ad679aa9fd728d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/gui/kernel/qopenglcontext.cpp')
| -rw-r--r-- | src/gui/kernel/qopenglcontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index ab71434c134..fbaff74561c 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -942,7 +942,7 @@ GLuint QOpenGLContext::defaultFramebufferObject() const The latter may happen if the surface is not exposed, or the graphics hardware is not available due to e.g. the application being suspended. - If \a surface is 0 this is equivalent to calling doneCurrent(). + If \a surface is \nullptr this is equivalent to calling doneCurrent(). Avoid calling this function from a different thread than the one the QOpenGLContext instance lives in. If you wish to use QOpenGLContext from a |