summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qregion.h
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2010-01-07 23:30:02 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2010-01-07 23:30:02 (GMT)
commit3f3e86d6fce5bb781bc41def35d0f15c58ef769c (patch)
treef79a0317d168a1961c11c2b8f3b772029e2902e1 /src/gui/painting/qregion.h
parentdbbf451755d34be44f6b7ac2e7c03ffe5528fb1b (diff)
parenta3c1b0703575ed5fc364011c73dc104ecdb8ef0c (diff)
downloadQt-3f3e86d6fce5bb781bc41def35d0f15c58ef769c.zip
Qt-3f3e86d6fce5bb781bc41def35d0f15c58ef769c.tar.gz
Qt-3f3e86d6fce5bb781bc41def35d0f15c58ef769c.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team 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;