summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qbackingstore.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-02 16:06:13 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-02 16:06:13 (GMT)
commitc5ac774717f1ec2c99407e3ee3c337127d94329e (patch)
treed316abfff7585c3ff9b8c08ecf9ef8b6bd0d73b0 /src/gui/painting/qbackingstore.cpp
parent187185bf246b63f080cf2a59b6768756b399e72c (diff)
parent8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb (diff)
downloadQt-c5ac774717f1ec2c99407e3ee3c337127d94329e.zip
Qt-c5ac774717f1ec2c99407e3ee3c337127d94329e.tar.gz
Qt-c5ac774717f1ec2c99407e3ee3c337127d94329e.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/painting/qbackingstore.cpp')
-rw-r--r--src/gui/painting/qbackingstore.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index dc7b808..df1210f 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -469,7 +469,7 @@ QRegion QWidgetBackingStore::dirtyRegion(QWidget *widget) const
/*!
Returns the static content inside the \a parent if non-zero; otherwise the static content
- for the entire backing store is returned. The content will be clipped to \a withingClipRect
+ for the entire backing store is returned. The content will be clipped to \a withinClipRect
if non-empty.
*/
QRegion QWidgetBackingStore::staticContents(QWidget *parent, const QRect &withinClipRect) const