4 files changed, 44 insertions, 18 deletions
diff --git a/src/corelib/tools/qmargins.cpp b/src/corelib/tools/qmargins.cpp
index a9413d6b5c..92c977a73b 100644
--- a/src/corelib/tools/qmargins.cpp
+++ b/src/corelib/tools/qmargins.cpp
@@ -33,7 +33,8 @@
 
 #include "qmargins.h"
 #include "qdatastream.h"
-#include "qdebug.h"
+
+#include <private/qdebug_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -431,10 +432,13 @@ QDataStream &operator>>(QDataStream &s, QMargins &m)
 #endif // QT_NO_DATASTREAM
 
 #ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, const QMargins &m) {
+QDebug operator<<(QDebug dbg, const QMargins &m)
+{
     QDebugStateSaver saver(dbg);
-    dbg.nospace() << "QMargins(" << m.left() << ", "
-            << m.top() << ", " << m.right() << ", " << m.bottom() << ')';
+    dbg.nospace();
+    dbg << "QMargins" << '(';
+    QtDebugUtils::formatQMargins(dbg, m);
+    dbg << ')';
     return dbg;
 }
 #endif
@@ -764,10 +768,13 @@ QDataStream &operator>>(QDataStream &s, QMarginsF &m)
 #endif // QT_NO_DATASTREAM
 
 #ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, const QMarginsF &m) {
+QDebug operator<<(QDebug dbg, const QMarginsF &m)
+{
     QDebugStateSaver saver(dbg);
-    dbg.nospace() << "QMarginsF(" << m.left() << ", "
-            << m.top() << ", " << m.right() << ", " << m.bottom() << ')';
+    dbg.nospace();
+    dbg << "QMarginsF" << '(';
+    QtDebugUtils::formatQMargins(dbg, m);
+    dbg << ')';
     return dbg;
 }
 #endif
diff --git a/src/corelib/tools/qpoint.cpp b/src/corelib/tools/qpoint.cpp
index ebce6c9422..dc2a2d9739 100644
--- a/src/corelib/tools/qpoint.cpp
+++ b/src/corelib/tools/qpoint.cpp
@@ -33,7 +33,8 @@
 
 #include "qpoint.h"
 #include "qdatastream.h"
-#include "qdebug.h"
+
+#include <private/qdebug_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -447,14 +448,20 @@ QDataStream &operator>>(QDataStream &s, QPoint &p)
 QDebug operator<<(QDebug dbg, const QPoint &p)
 {
     QDebugStateSaver saver(dbg);
-    dbg.nospace() << "QPoint(" << p.x() << ',' << p.y() << ')';
+    dbg.nospace();
+    dbg << "QPoint" << '(';
+    QtDebugUtils::formatQPoint(dbg, p);
+    dbg << ')';
     return dbg;
 }
 
 QDebug operator<<(QDebug dbg, const QPointF &p)
 {
     QDebugStateSaver saver(dbg);
-    dbg.nospace() << "QPointF(" << p.x() << ',' << p.y() << ')';
+    dbg.nospace();
+    dbg << "QPointF" << '(';
+    QtDebugUtils::formatQPoint(dbg, p);
+    dbg << ')';
     return dbg;
 }
 #endif
diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp
index 35cf2d5e5b..b2174745e4 100644
--- a/src/corelib/tools/qrect.cpp
+++ b/src/corelib/tools/qrect.cpp
@@ -33,9 +33,10 @@
 
 #include "qrect.h"
 #include "qdatastream.h"
-#include "qdebug.h"
 #include "qmath.h"
 
+#include <private/qdebug_p.h>
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -1279,8 +1280,10 @@ QDataStream &operator>>(QDataStream &s, QRect &r)
 QDebug operator<<(QDebug dbg, const QRect &r)
 {
     QDebugStateSaver saver(dbg);
-    dbg.nospace() << "QRect(" << r.x() << ',' << r.y() << ' '
-                  << r.width() << 'x' << r.height() << ')';
+    dbg.nospace();
+    dbg << "QRect" << '(';
+    QtDebugUtils::formatQRect(dbg, r);
+    dbg << ')';
     return dbg;
 }
 #endif
@@ -2488,8 +2491,10 @@ QDataStream &operator>>(QDataStream &s, QRectF &r)
 QDebug operator<<(QDebug dbg, const QRectF &r)
 {
     QDebugStateSaver saver(dbg);
-    dbg.nospace() << "QRectF(" << r.x() << ',' << r.y() << ' '
-                  << r.width() << 'x' << r.height() << ')';
+    dbg.nospace();
+    dbg << "QRectF" << '(';
+    QtDebugUtils::formatQRect(dbg, r);
+    dbg << ')';
     return dbg;
 }
 #endif
diff --git a/src/corelib/tools/qsize.cpp b/src/corelib/tools/qsize.cpp
index d91dd0d130..19227432f2 100644
--- a/src/corelib/tools/qsize.cpp
+++ b/src/corelib/tools/qsize.cpp
@@ -33,7 +33,8 @@
 
 #include "qsize.h"
 #include "qdatastream.h"
-#include "qdebug.h"
+
+#include <private/qdebug_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -440,7 +441,10 @@ QDataStream &operator>>(QDataStream &s, QSize &sz)
 QDebug operator<<(QDebug dbg, const QSize &s)
 {
     QDebugStateSaver saver(dbg);
-    dbg.nospace() << "QSize(" << s.width() << ", " << s.height() << ')';
+    dbg.nospace();
+    dbg << "QSize(";
+    QtDebugUtils::formatQSize(dbg, s);
+    dbg << ')';
     return dbg;
 }
 #endif
@@ -867,7 +871,10 @@ QDataStream &operator>>(QDataStream &s, QSizeF &sz)
 QDebug operator<<(QDebug dbg, const QSizeF &s)
 {
     QDebugStateSaver saver(dbg);
-    dbg.nospace() << "QSizeF(" << s.width() << ", " << s.height() << ')';
+    dbg.nospace();
+    dbg << "QSizeF(";
+    QtDebugUtils::formatQSize(dbg, s);
+    dbg << ')';
     return dbg;
 }
 #endif