diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-17 01:00:20 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-04-17 10:46:57 +0200 |
| commit | e4707f8ae9dc198abd1460384d1573420f663a84 (patch) | |
| tree | 6cae05ad48f31f13d05237f1af52e9d7dc394eb7 /src/quick/items/qquickwindow.cpp | |
| parent | c3fcbe73189b26e49ad8fa824b2b8e6b7db0a8f4 (diff) | |
| parent | b3eb349ddddec6967fcedfdbfc857b99f34e552a (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/qmltyperegistrar/qmltypesclassdescription.cpp
src/quick/items/qquickrendertarget.h
Change-Id: I9e24d2252a35b8e74af89ad72af796df658167ca
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index bb3aff0cd6..445eea7fa6 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -5044,6 +5044,11 @@ void QQuickWindow::setDefaultAlphaBuffer(bool useAlpha) \note This function only has an effect when using the default OpenGL scene graph adaptation. + \note This function will only reset the OpenGL context in relation to what has been changed + internally as part of the OpenGL scene graph. It does not reset anything that has been changed + externally such as direct OpenGL calls done inside the application code if those same calls are + not used internally. + \note This function has no effect when running on the RHI graphics abstraction and the underlying RHI backend is not OpenGL. |