QtGui: port away from QRegion::rects()

Use begin()/end()/rectCount() instead, which don't require QRegionPrivate
::vectorize() calls.

In QPaintEngineEx::clip(), the rectCount() == 1 case called clip(QRect), but
forgot to return, causing another clip(QVectorPath) call with the same
arguments. Fixed.

Change-Id: Ife33112fc8006ed4bdff6409e2b8465ce7acb9d1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index 1b8aae16e1..dcff6a1d72 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -447,19 +447,20 @@ QDebug operator<<(QDebug s, const QRegion &r)
     } else if (r.isEmpty()) {
         s << "empty";
     } else {
-        const QVector<QRect> rects = r.rects();
-        const int count = rects.size();
+        const int count = r.rectCount();
         if (count > 1)
             s << "size=" << count << ", bounds=(";
         QtDebugUtils::formatQRect(s, r.boundingRect());
         if (count > 1) {
             s << ") - [";
-            for (int i = 0; i < count; ++i) {
-                if (i)
+            bool first = true;
+            for (const QRect &rect : r) {
+                if (!first)
                     s << ", ";
                 s << '(';
-                QtDebugUtils::formatQRect(s, rects.at(i));
+                QtDebugUtils::formatQRect(s, rect);
                 s << ')';
+                first = false;
             }
             s << ']';
         }