diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-02 12:24:46 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-02 12:24:46 (GMT) |
| commit | 54796e0d3150df7dd94e715c095c21fb227139ee (patch) | |
| tree | 28fbc8e03ebe3ad836b7c6ca243213da269f60ac /src/gui/painting | |
| parent | ad229913fd89aa0a33fb9b37ac96ff63c89a05f8 (diff) | |
| parent | 9ec7bbcb96149b1ce8a2d62b55c824d71ff292a8 (diff) | |
| download | Qt-54796e0d3150df7dd94e715c095c21fb227139ee.zip Qt-54796e0d3150df7dd94e715c095c21fb227139ee.tar.gz Qt-54796e0d3150df7dd94e715c095c21fb227139ee.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7
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 ee590a4..b7eaf85 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -8797,7 +8797,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) \ |