summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qregion.h
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-12-11 11:11:45 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-12-11 11:11:45 (GMT)
commitb42da2ec8677ce67ecd5d5f8188537e2a597da2a (patch)
treee41b2eb449e0d0392e85603612836d935967f400 /src/gui/painting/qregion.h
parent664c78144754c499d07a95c3914fd34202bf4b98 (diff)
parent343de9228ae65c36c4a9a45297d45cdeb04a8e44 (diff)
downloadQt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.zip
Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.tar.gz
Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/painting/qregion.h')
-rw-r--r--src/gui/painting/qregion.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index 2a1be86..f99fbf6 100644
--- a/src/gui/painting/qregion.h
+++ b/src/gui/painting/qregion.h
@@ -116,7 +116,9 @@ public:
QRect boundingRect() const;
QVector<QRect> rects() const;
void setRects(const QRect *rect, int num);
+#ifdef QT_DEPRECATED
QT_DEPRECATED int numRects() const;
+#endif
int rectCount() const;
const QRegion operator|(const QRegion &r) const;