diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-17 10:29:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-17 10:29:20 (GMT) |
| commit | cb3b83e64154e9725c0c050ea32a4a632ad9f041 (patch) | |
| tree | fb8e2ff978f6fcb218d6d26ddaa631c6e5f085da /src/gui/painting | |
| parent | e969212de0b2ac816a46db8897d54e9ed78d57b8 (diff) | |
| parent | ae0d4fcee9087521afe03732001a0267b06e0317 (diff) | |
| download | Qt-cb3b83e64154e9725c0c050ea32a4a632ad9f041.zip Qt-cb3b83e64154e9725c0c050ea32a4a632ad9f041.tar.gz Qt-cb3b83e64154e9725c0c050ea32a4a632ad9f041.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (45 commits)
Doc: css fine tuning
Doc: Fixed a non-compiling example.
Doc: removing linebreak
Doc: correcting html template
Doc: Updated What's new in 4.7 page
Doc: Updated What's new in 4.7 page
Doc: Removing google analytics from offline docs
Doc: fixing creator bug in page footer
Doc: correcting html template - validating
Doc: fixing issues with table indent - css
Doc: Fixing style: line height, ol indent, coulmns (css3)
Doc: correcting html template
Doc: Updated the Mac requirements page.
Doc: Cleaning up the known issues page. Pointing people to check the online resources.
Added a QFormLayout snippet to the layout.qdoc and layouts.cpp
Doc: Removing section about Multimedia - playback and declarative elements. This was descoped from Qt 4.7.
Doc: Listed undoable operations in QTextDocument
Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
Doc: Note on updating proxy models with dynamic sort filters
qdoc: Fixed an html formatting error in the QML property list.
...
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qregion.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index c6046ac..12be93e 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -8798,7 +8798,7 @@ QPainterPath QPaintEngineState::clipPath() const } /*! - Returns wether clipping is enabled or not in the current paint + Returns whether clipping is enabled or not in the current paint engine state. This variable should only be used when the state() returns a diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index bfeef72..3412f9b 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -1699,8 +1699,8 @@ QT_BEGIN_INCLUDE_NAMESPACE #include <limits.h> QT_END_INCLUDE_NAMESPACE -/* 1 if two BOXs overlap. - * 0 if two BOXs do not overlap. +/* 1 if two BOXes overlap. + * 0 if two BOXes do not overlap. * Remember, x2 and y2 are not in the region */ #define EXTENTCHECK(r1, r2) \ |