summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qregion.h
diff options
context:
space:
mode:
authorAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2009-11-11 09:33:57 (GMT)
committerAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2009-11-11 09:33:57 (GMT)
commit6855df6110eebdbfc43211f20dd65f446ccda209 (patch)
treedd731afb046463a7dcbe249f7ea9de0484195b2a /src/gui/painting/qregion.h
parent835a23891567831cf184e5bbaba8d00bfc912699 (diff)
parent95db13345cd7b6b7cac8725fe2879aaf80233818 (diff)
downloadQt-6855df6110eebdbfc43211f20dd65f446ccda209.zip
Qt-6855df6110eebdbfc43211f20dd65f446ccda209.tar.gz
Qt-6855df6110eebdbfc43211f20dd65f446ccda209.tar.bz2
Merge remote branch 'qt/4.6' into kinetic-declarativeui
Diffstat (limited to 'src/gui/painting/qregion.h')
-rw-r--r--src/gui/painting/qregion.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index 7e459ed..2a1be86 100644
--- a/src/gui/painting/qregion.h
+++ b/src/gui/painting/qregion.h
@@ -116,7 +116,8 @@ public:
QRect boundingRect() const;
QVector<QRect> rects() const;
void setRects(const QRect *rect, int num);
- int numRects() const;
+ QT_DEPRECATED int numRects() const;
+ int rectCount() const;
const QRegion operator|(const QRegion &r) const;
const QRegion operator+(const QRegion &r) const;