diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-18 13:15:38 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-12-18 13:15:38 +0000 |
commit | d44cd5334a97f30a50295c385f855d751c187b9e (patch) | |
tree | 45f29d64ba376138c1095b5c64d9c2481d92d801 /src/gui/painting/qregion.cpp | |
parent | 8b1eb5f4202fb4120a303cd2183bb96f212c5a32 (diff) | |
parent | beb65dcd79f8c354dab7bb4a8d08157bd9d69329 (diff) |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/painting/qregion.cpp')
-rw-r--r-- | src/gui/painting/qregion.cpp | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index e6b777a30e..5e648eabf5 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -41,7 +41,7 @@ #include "qimage.h" #include "qbitmap.h" -#include <qdebug.h> +#include <private/qdebug_p.h> QT_BEGIN_NAMESPACE @@ -422,11 +422,32 @@ QDataStream &operator>>(QDataStream &s, QRegion &r) #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug s, const QRegion &r) { - QVector<QRect> rects = r.rects(); - s.nospace() << "QRegion(size=" << rects.size() << "), " - << "bounds = " << r.boundingRect() << '\n'; - for (int i=0; i<rects.size(); ++i) - s << "- " << i << rects.at(i) << '\n'; + QDebugStateSaver saver(s); + s.nospace(); + s << "QRegion("; + if (r.isNull()) { + s << "null"; + } else if (r.isEmpty()) { + s << "empty"; + } else { + const QVector<QRect> rects = r.rects(); + const int count = rects.size(); + 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) + s << ", "; + s << '('; + QtDebugUtils::formatQRect(s, rects.at(i)); + s << ')'; + } + s << ']'; + } + } + s << ')'; return s; } #endif |