Keep global state of debug stream (QImage, QPixmap, and QIcon)

Make sure that the stream's formatting settings are preserved.

Change-Id: Ib13b5e0b36b2ef801da2d2d5c240d28dc1b04653
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 4f5e9c3d1f..ac95222c99 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -1321,18 +1321,20 @@ QDataStream &operator>>(QDataStream &s, QIcon &icon)
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug dbg, const QIcon &i)
 {
-    QDebug nospace = dbg.nospace();
-    nospace << "QIcon(";
+    QDebugStateSaver saver(dbg);
+    dbg.resetFormat();
+    dbg.nospace();
+    dbg << "QIcon(";
     if (i.isNull()) {
-        nospace << "null";
+        dbg << "null";
     } else {
         if (!i.name().isEmpty())
-            nospace << i.name() << ',';
-        nospace << "availableSizes[normal,Off]=" << i.availableSizes()
+            dbg << i.name() << ',';
+        dbg << "availableSizes[normal,Off]=" << i.availableSizes()
             << ",cacheKey=" << showbase << hex << i.cacheKey() << dec << noshowbase;
     }
-    nospace << ')';
-    return dbg.space();
+    dbg << ')';
+    return dbg;
 }
 #endif