1 files changed, 94 insertions, 2 deletions

diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp
index 3370cce6d5..b0411f9dd9 100644
--- a/src/corelib/io/qdebug.cpp
+++ b/src/corelib/io/qdebug.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 QtCore module of the Qt Toolkit.
@@ -79,6 +79,18 @@ QT_BEGIN_NAMESPACE
     used to write debugging information to files and other devices. The constructor
     that accepts a QString is used to write to a string for display or serialization.
 
+    \section1 Formatting Options
+
+    QDebug formats output so that it's easily readable. It automatically adds spaces
+    between arguments, and adds quotes around QString, QByteArray, QChar arguments.
+
+    You can tweak these options through the space(), nospace() and quote(), noquote()
+    methods. Furthermore, \l{QTextStream manipulators} can be piped into a QDebug
+    stream.
+
+    QDebugStateSaver limits changes to the formatting to the current scope.
+    resetFormat() resets the options to the default ones.
+
     \section1 Writing Custom Types to a Stream
 
     Many standard types can be written to QDebug objects, and Qt provides support for
@@ -128,6 +140,20 @@ QT_BEGIN_NAMESPACE
 
     Flushes any pending data to be written and destroys the debug stream.
 */
+// Has been defined in the header / inlined before Qt 5.4
+QDebug::~QDebug()
+{
+    if (!--stream->ref) {
+        if (stream->space && stream->buffer.endsWith(QLatin1Char(' ')))
+            stream->buffer.chop(1);
+        if (stream->message_output) {
+            qt_message_output(stream->type,
+                              stream->context,
+                              stream->buffer);
+        }
+        delete stream;
+    }
+}
 
 /*!
     \fn QDebug::swap(QDebug &other)
@@ -138,6 +164,21 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
+    Resets the stream formatting options, bringing it back to its original constructed state.
+
+    \sa space(), quote()
+    \since 5.4
+*/
+QDebug &QDebug::resetFormat()
+{
+    stream->ts.reset();
+    stream->space = true;
+    if (stream->context.version > 1)
+        stream->flags = 0;
+    return *this;
+}
+
+/*!
     \fn QDebug &QDebug::space()
 
     Writes a space character to the debug stream and returns a reference to
@@ -188,6 +229,41 @@ QT_BEGIN_NAMESPACE
     \sa QDebugStateSaver
 */
 
+
+/*!
+    \fn QDebug &QDebug::quote()
+    \since 5.4
+
+    Enables automatic insertion of quotation characters around QChar, QString and QByteArray
+    contents and returns a reference to the stream.
+
+    Quoting is enabled by default.
+
+    \sa noquote(), maybeQuote()
+*/
+
+/*!
+    \fn QDebug &QDebug::noquote()
+    \since 5.4
+
+    Disables automatic insertion of quotation characters around QChar, QString and QByteArray
+    contents and returns a reference to the stream.
+
+    \sa quote(), maybeQuote()
+*/
+
+/*!
+    \fn QDebug &QDebug::maybeQuote(char c)
+    \since 5.4
+
+    Writes a character \a c to the debug stream, depending on the
+    current setting for automatic insertion of quotes, and returns a reference to the stream.
+
+    The default character is a double quote \c{"}.
+
+    \sa quote(), noquote()
+*/
+
 /*!
     \fn QDebug &QDebug::operator<<(QChar t)
 
@@ -334,7 +410,9 @@ QT_BEGIN_NAMESPACE
 
     \brief Convenience class for custom QDebug operators
 
-    Saves the settings used by QDebug, and restores them upon destruction.
+    Saves the settings used by QDebug, and restores them upon destruction,
+    then calls maybeSpace(), to separate arguments with a space if
+    autoInsertSpaces() was true at the time of constructing the QDebugStateSaver.
 
     The automatic insertion of spaces between writes is one of the settings
     that QDebugStateSaver stores for the duration of the current block.
@@ -352,19 +430,33 @@ public:
     QDebugStateSaverPrivate(QDebug &dbg)
         : m_dbg(dbg),
           m_spaces(dbg.autoInsertSpaces()),
+          m_flags(0),
           m_streamParams(dbg.stream->ts.d_ptr->params)
     {
+        if (m_dbg.stream->context.version > 1)
+            m_flags = m_dbg.stream->flags;
     }
     void restoreState()
     {
+        const bool currentSpaces = m_dbg.autoInsertSpaces();
+        if (currentSpaces && !m_spaces)
+            if (m_dbg.stream->buffer.endsWith(QLatin1Char(' ')))
+                m_dbg.stream->buffer.chop(1);
+
         m_dbg.setAutoInsertSpaces(m_spaces);
         m_dbg.stream->ts.d_ptr->params = m_streamParams;
+        if (m_dbg.stream->context.version > 1)
+            m_dbg.stream->flags = m_flags;
+
+        if (!currentSpaces && m_spaces)
+            m_dbg.stream->ts << ' ';
     }
 
     QDebug &m_dbg;
 
     // QDebug state
     const bool m_spaces;
+    int m_flags;
 
     // QTextStream state
     const QTextStreamPrivate::Params m_streamParams;