diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 01:13:46 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 01:13:46 (GMT) |
commit | 0f6b319105b7e4305bc5ac1c5091f8a55be9b545 (patch) | |
tree | 24916212a2e49bf623f6a6f265c5643128c204fb /src/gui/painting/qpainter.cpp | |
parent | c633ce4346fa04584e5168b77924ca6a42601435 (diff) | |
parent | 86372d8d9bf081b2a1ab2df7942f41309b1842fa (diff) | |
download | Qt-0f6b319105b7e4305bc5ac1c5091f8a55be9b545.zip Qt-0f6b319105b7e4305bc5ac1c5091f8a55be9b545.tar.gz Qt-0f6b319105b7e4305bc5ac1c5091f8a55be9b545.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (165 commits)
Add 'We mean it.' header.
Use provided typedef for QNetworkConfigurationPrivatePointer.
Fix public includes.
Document networkSessionOnline() signal and mark as internal.
Tag new classes as since 4.7.
Fix documentation.
Remove debug.
Update copyright year to 2010.
We don't need to migrate cached replies.
Fix after reworking to use signals/slots.
Remove debug.
Rename and remove unused private slots.
Add comments to private state enums.
Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."
Move check for range header support to before deleting backend.
Don't try to migrate finished or aborted requests.
Clarify TemporaryNetworkFailureError docs.
Remove functions used for testing.
Connect signals between QNAM and QNetworkReplyImpl.
Fix networkAccessEnabled implementation.
...
Diffstat (limited to 'src/gui/painting/qpainter.cpp')
-rw-r--r-- | src/gui/painting/qpainter.cpp | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index bf12c6b..270144b 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -38,6 +38,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + // QtCore #include <qdebug.h> #include <qmath.h> @@ -1986,12 +1987,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: + + \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 - Here is an example that shows intermixing of painter commands - and raw OpenGL commands: + 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 |