1 files changed, 20 insertions, 5 deletions

diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h
index 59bd32e9a4..9391799624 100644
--- a/src/corelib/io/qdebug.h
+++ b/src/corelib/io/qdebug.h
@@ -53,9 +53,14 @@ class Q_CORE_EXPORT QDebug
     friend class QMessageLogger;
     friend class QDebugStateSaverPrivate;
     struct Stream {
-        Stream(QIODevice *device) : ts(device), ref(1), type(QtDebugMsg), space(true), message_output(false), flags(0) {}
-        Stream(QString *string) : ts(string, QIODevice::WriteOnly), ref(1), type(QtDebugMsg), space(true), message_output(false), flags(0) {}
-        Stream(QtMsgType t) : ts(&buffer, QIODevice::WriteOnly), ref(1), type(t), space(true), message_output(true), flags(0) {}
+        enum { defaultVerbosity = 2, verbosityShift = 29, verbosityMask = 0x7 };
+
+        Stream(QIODevice *device) : ts(device), ref(1), type(QtDebugMsg),
+            space(true), message_output(false), flags(defaultVerbosity << verbosityShift) {}
+        Stream(QString *string) : ts(string, QIODevice::WriteOnly), ref(1), type(QtDebugMsg),
+            space(true), message_output(false), flags(defaultVerbosity << verbosityShift) {}
+        Stream(QtMsgType t) : ts(&buffer, QIODevice::WriteOnly), ref(1), type(t),
+            space(true), message_output(true), flags(defaultVerbosity << verbosityShift) {}
         QTextStream ts;
         QString buffer;
         int ref;
@@ -64,7 +69,7 @@ class Q_CORE_EXPORT QDebug
         bool message_output;
         QMessageLogContext context;
 
-        enum FormatFlag {
+        enum FormatFlag { // Note: Bits 29..31 are reserved for the verbose level introduced in 5.6.
             NoQuotes = 0x1
         };
 
@@ -72,7 +77,15 @@ class Q_CORE_EXPORT QDebug
         bool testFlag(FormatFlag flag) const { return (context.version > 1) ? (flags & flag) : false; }
         void setFlag(FormatFlag flag) { if (context.version > 1) { flags |= flag; } }
         void unsetFlag(FormatFlag flag) { if (context.version > 1) { flags &= ~flag; } }
-
+        int verbosity() const
+        { return context.version > 1 ? (flags >> verbosityShift) & verbosityMask : int(Stream::defaultVerbosity); }
+        void setVerbosity(int v)
+        {
+            if (context.version > 1) {
+                flags &= ~(verbosityMask << verbosityShift);
+                flags |= (v & verbosityMask) << verbosityShift;
+            }
+        }
         // added in 5.4
         int flags;
     } *stream;
@@ -96,6 +109,8 @@ public:
     inline QDebug &space() { stream->space = true; stream->ts << ' '; return *this; }
     inline QDebug &nospace() { stream->space = false; return *this; }
     inline QDebug &maybeSpace() { if (stream->space) stream->ts << ' '; return *this; }
+    int verbosity() const { return stream->verbosity(); }
+    void setVerbosity(int verbosityLevel) { stream->setVerbosity(verbosityLevel); }
 
     bool autoInsertSpaces() const { return stream->space; }
     void setAutoInsertSpaces(bool b) { stream->space = b; }