1 files changed, 20 insertions, 12 deletions
diff --git a/src/multimedia/video/qabstractvideosurface.cpp b/src/multimedia/video/qabstractvideosurface.cpp
index e54c5fbc2..c86d52dd2 100644
--- a/src/multimedia/video/qabstractvideosurface.cpp
+++ b/src/multimedia/video/qabstractvideosurface.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -353,18 +353,26 @@ void QAbstractVideoSurface::setNativeResolution(const QSize &resolution)
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug dbg, const QAbstractVideoSurface::Error& error)
 {
+    QDebugStateSaver saver(dbg);
+    dbg.nospace();
     switch (error) {
     case QAbstractVideoSurface::UnsupportedFormatError:
-        return dbg.nospace() << "UnsupportedFormatError";
+        dbg << "UnsupportedFormatError";
+        break;
     case QAbstractVideoSurface::IncorrectFormatError:
-        return dbg.nospace() << "IncorrectFormatError";
+        dbg << "IncorrectFormatError";
+        break;
     case QAbstractVideoSurface::StoppedError:
-        return dbg.nospace() << "StoppedError";
+        dbg << "StoppedError";
+        break;
     case QAbstractVideoSurface::ResourceError:
-        return dbg.nospace() << "ResourceError";
+        dbg << "ResourceError";
+        break;
     default:
-        return dbg.nospace() << "NoError";
+        dbg << "NoError";
+        break;
     }
+    return dbg;
 }
 #endif