diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 10:24:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 10:28:48 +0200 |
| commit | 9556f6d075b61fa95d6e1057f305e522a26f71d6 (patch) | |
| tree | 53190472453390810c47b9b5a47b23188a00267e /src/quick/items/qquickframebufferobject.cpp | |
| parent | 42ffe9b193a5bd958b0853233fd0d94170722bd1 (diff) | |
| parent | 1fd0cdc6a2e01775d8a79c6614910cc5a2fbf2b3 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/qml/jsruntime/qv4engine_p.h
src/quick/items/qquickitemsmodule.cpp
src/quick/items/qquicktext.cpp
src/quick/util/qquickpixmapcache.cpp
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
Change-Id: I90ecaad6a4bfaa4f36149a7463f4d7141f4a516a
Diffstat (limited to 'src/quick/items/qquickframebufferobject.cpp')
| -rw-r--r-- | src/quick/items/qquickframebufferobject.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/quick/items/qquickframebufferobject.cpp b/src/quick/items/qquickframebufferobject.cpp index 758727ed9e..c3e5b97baf 100644 --- a/src/quick/items/qquickframebufferobject.cpp +++ b/src/quick/items/qquickframebufferobject.cpp @@ -386,6 +386,17 @@ QOpenGLFramebufferObject *QQuickFramebufferObject::Renderer::framebufferObject() * the FBO size. * * The FBO will be automatically unbound after the function returns. + * + * \note Do not assume that the OpenGL state is all set to the defaults when + * this function is invoked, or that it is maintained between calls. Both the Qt + * Quick renderer and the custom rendering code uses the same OpenGL + * context. This means that the state might have been modified by Quick before + * invoking this function. + * + * \note It is recommended to call QQuickWindow::resetOpenGLState() before + * returning. This resets OpenGL state used by the Qt Quick renderer and thus + * avoids interference from the state changes made by the rendering code in this + * function. */ /*! |