diff options
author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-02-08 15:43:35 (GMT) |
---|---|---|
committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-02-08 15:43:35 (GMT) |
commit | 393ce9aca99751fe64496467b135e187e8433ab2 (patch) | |
tree | 48ed2119bdc0ef2f8ce8db5551aa96476e37389a | |
parent | 49b01a107262a8edca92b12a65b54f63017d9d16 (diff) | |
parent | 8ce0a7dfac6955ab3b5bf6cd0ee4abe63f753618 (diff) | |
download | Qt-393ce9aca99751fe64496467b135e187e8433ab2.zip Qt-393ce9aca99751fe64496467b135e187e8433ab2.tar.gz Qt-393ce9aca99751fe64496467b135e187e8433ab2.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
-rw-r--r-- | src/gui/painting/qpainter.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index bf12c6b..3bcaf8c 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -1986,12 +1986,25 @@ QPaintEngine *QPainter::paintEngine() const endNativePainting(). Note that only the states the underlying paint engine changes will be reset - to their respective default states. If, for example, the OpenGL polygon - mode is changed by the user inside a beginNativePaint()/endNativePainting() - block, it will not be reset to the default state by endNativePainting(). + to their respective default states. The states we reset may change from + release to release. The following states are currently reset in the OpenGL + 2 engine: - Here is an example that shows intermixing of painter commands - and raw OpenGL commands: + \list + \i blending is disabled + \i the depth, stencil and scissor tests are disabled + \i the active texture unit is reset to 0 + \i the depth mask, depth function and the clear depth are reset to their + default values + \i the stencil mask, stencil operation and stencil function are reset to + their default values + \i the current color is reset to solid white + \endlist + + If, for example, the OpenGL polygon mode is changed by the user inside a + beginNativePaint()/endNativePainting() block, it will not be reset to the + default state by endNativePainting(). Here is an example that shows + intermixing of painter commands and raw OpenGL commands: \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 21 |