Merge remote-tracking branch 'gerrit/dev' into dev-highdpi

Conflicts:
	src/plugins/platforms/xcb/qxcbbackingstore.cpp

Change-Id: Ib7f277957636186d0abd58d8c710392ef7b02e13

1 files changed, 12 insertions, 8 deletions

diff --git a/src/gui/opengl/qopengldebug.cpp b/src/gui/opengl/qopengldebug.cpp
index 114f118989..e747372df9 100644
--- a/src/gui/opengl/qopengldebug.cpp
+++ b/src/gui/opengl/qopengldebug.cpp
@@ -1039,10 +1039,11 @@ bool QOpenGLDebugMessage::operator==(const QOpenGLDebugMessage &debugMessage) co
 */
 QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Source source)
 {
+    QDebugStateSaver saver(debug);
     debug.nospace() << "QOpenGLDebugMessage::Source("
                     << qt_messageSourceToString(source)
-                    << ")";
-    return debug.space();
+                    << ')';
+    return debug;
 }
 
 /*!
@@ -1053,10 +1054,11 @@ QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Source source)
 */
 QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Type type)
 {
+    QDebugStateSaver saver(debug);
     debug.nospace() << "QOpenGLDebugMessage::Type("
                     << qt_messageTypeToString(type)
-                    << ")";
-    return debug.space();
+                    << ')';
+    return debug;
 }
 
 /*!
@@ -1067,10 +1069,11 @@ QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Type type)
 */
 QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Severity severity)
 {
+    QDebugStateSaver saver(debug);
     debug.nospace() << "QOpenGLDebugMessage::Severity("
                     << qt_messageSeverityToString(severity)
-                    << ")";
-    return debug.space();
+                    << ')';
+    return debug;
 }
 
 /*!
@@ -1081,13 +1084,14 @@ QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Severity severity)
 */
 QDebug operator<<(QDebug debug, const QOpenGLDebugMessage &message)
 {
+    QDebugStateSaver saver(debug);
     debug.nospace() << "QOpenGLDebugMessage("
                     << qt_messageSourceToString(message.source()) << ", "
                     << message.id() << ", "
                     << message.message() << ", "
                     << qt_messageSeverityToString(message.severity()) << ", "
-                    << qt_messageTypeToString(message.type()) << ")";
-    return debug.space();
+                    << qt_messageTypeToString(message.type()) << ')';
+    return debug;
 
 }
 #endif // QT_NO_DEBUG_STREAM