diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 19:45:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 19:45:42 (GMT) |
| commit | 8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb (patch) | |
| tree | a808f038dd5f1b254d2f41d637c085b8ccbbc747 /src/gui/painting | |
| parent | d194ebdc199fdd85245bfecb766d836dfa79c3f3 (diff) | |
| parent | a4f3cd9d7e67a8335d941321d7b8d6406d9907d6 (diff) | |
| download | Qt-8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb.zip Qt-8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb.tar.gz Qt-8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb.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:
QNAM HTTP: tst_qnetworkreply with setReadBufferSize() set
Fix compilation on AIX 5.3 with gcc
Doc: Fixed typo
Fix poor English in QStyle::polish documentation.
Fix a few typos in comments and docs.
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qbackingstore.cpp | 2 |
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 |