summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qbackingstore.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-11-02 00:45:25 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-11-02 00:45:25 (GMT)
commit13eebf835df3d8fec88a68b571d33e73da929413 (patch)
tree707d8b3f08ae56d80e9e1e06de326e9f856e1016 /src/gui/painting/qbackingstore.cpp
parent155065cd5c611e2d14357a8ff3180ac14a68e3a0 (diff)
parent8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb (diff)
downloadQt-13eebf835df3d8fec88a68b571d33e73da929413.zip
Qt-13eebf835df3d8fec88a68b571d33e73da929413.tar.gz
Qt-13eebf835df3d8fec88a68b571d33e73da929413.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 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 ac9b994..8a1c154 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -446,7 +446,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