diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-06 19:10:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-06 19:10:25 +0200 |
| commit | 20cac3d9c9c22153e9e316daff32b6050ff6be6b (patch) | |
| tree | b563a89475df9afb4f40841ec371be9488d5b1ed /src/gui/opengl/qopengldebug.cpp | |
| parent | 8ce85d74b692392a4ea0785360156f37418cff13 (diff) | |
| parent | 9eb0b09abce28b11e4915fc9c3b3e996eb19cef2 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: If9fd98525b6b4ca07e5e006fc98bf372a73b8a21
Diffstat (limited to 'src/gui/opengl/qopengldebug.cpp')
| -rw-r--r-- | src/gui/opengl/qopengldebug.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/gui/opengl/qopengldebug.cpp b/src/gui/opengl/qopengldebug.cpp index 114f1189892..e747372df94 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 |