1 files changed, 25 insertions, 16 deletions
diff --git a/src/corelib/tools/qmargins.cpp b/src/corelib/tools/qmargins.cpp
index 265e44bfcf..92c977a73b 100644
--- a/src/corelib/tools/qmargins.cpp
+++ b/src/corelib/tools/qmargins.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -33,7 +33,8 @@
 
 #include "qmargins.h"
 #include "qdatastream.h"
-#include "qdebug.h"
+
+#include <private/qdebug_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -431,10 +432,14 @@ QDataStream &operator>>(QDataStream &s, QMargins &m)
 #endif // QT_NO_DATASTREAM
 
 #ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, const QMargins &m) {
-    dbg.nospace() << "QMargins(" << m.left() << ", "
-            << m.top() << ", " << m.right() << ", " << m.bottom() << ')';
-    return dbg.space();
+QDebug operator<<(QDebug dbg, const QMargins &m)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace();
+    dbg << "QMargins" << '(';
+    QtDebugUtils::formatQMargins(dbg, m);
+    dbg << ')';
+    return dbg;
 }
 #endif
 
@@ -763,10 +768,14 @@ QDataStream &operator>>(QDataStream &s, QMarginsF &m)
 #endif // QT_NO_DATASTREAM
 
 #ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, const QMarginsF &m) {
-    dbg.nospace() << "QMarginsF(" << m.left() << ", "
-            << m.top() << ", " << m.right() << ", " << m.bottom() << ')';
-    return dbg.space();
+QDebug operator<<(QDebug dbg, const QMarginsF &m)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace();
+    dbg << "QMarginsF" << '(';
+    QtDebugUtils::formatQMargins(dbg, m);
+    dbg << ')';
+    return dbg;
 }
 #endif