1 files changed, 7 insertions, 8 deletions
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h
index 91fde75fa5..421c5d933b 100644
--- a/src/corelib/io/qdebug.h
+++ b/src/corelib/io/qdebug.h
@@ -65,6 +65,7 @@ QT_BEGIN_NAMESPACE
 class Q_CORE_EXPORT QDebug
 {
     friend class QMessageLogger;
+    friend class QDebugStateSaver;
     friend class QDebugStateSaverPrivate;
     struct Stream {
         enum { VerbosityShift = 29, VerbosityMask = 0x7 };
@@ -114,9 +115,12 @@ public:
     inline QDebug(QString *string) : stream(new Stream(string)) {}
     inline QDebug(QtMsgType t) : stream(new Stream(t)) {}
     inline QDebug(const QDebug &o):stream(o.stream) { ++stream->ref; }
+    QDebug(QDebug &&other) noexcept : stream{qExchange(other.stream, nullptr)} {}
     inline QDebug &operator=(const QDebug &other);
+    QDebug &operator=(QDebug &&other) noexcept
+    { QDebug{std::move(other)}.swap(*this); return *this; }
     ~QDebug();
-    inline void swap(QDebug &other) Q_DECL_NOTHROW { qSwap(stream, other.stream); }
+    inline void swap(QDebug &other) noexcept { qSwap(stream, other.stream); }
 
     QDebug &resetFormat();
 
@@ -161,9 +165,7 @@ public:
     inline QDebug &operator<<(QLatin1String t) { putByteArray(t.latin1(), t.size(), ContainsLatin1); return maybeSpace(); }
     inline QDebug &operator<<(const QByteArray & t) { putByteArray(t.constData(), t.size(), ContainsBinary); return maybeSpace(); }
     inline QDebug &operator<<(const void * t) { stream->ts << t; return maybeSpace(); }
-#ifdef Q_COMPILER_NULLPTR
     inline QDebug &operator<<(std::nullptr_t) { stream->ts << "(nullptr)"; return maybeSpace(); }
-#endif
     inline QDebug &operator<<(QTextStreamFunction f) {
         stream->ts << f;
         return *this;
@@ -205,10 +207,7 @@ public:
 
 inline QDebug &QDebug::operator=(const QDebug &other)
 {
-    if (this != &other) {
-        QDebug copy(other);
-        qSwap(stream, copy.stream);
-    }
+    QDebug{other}.swap(*this);
     return *this;
 }
 
@@ -352,7 +351,7 @@ void qt_QMetaEnum_flagDebugOperator(QDebug &debug, size_t sizeofT, Int value)
 {
     const QDebugStateSaver saver(debug);
     debug.resetFormat();
-    debug.nospace() << "QFlags(" << hex << showbase;
+    debug.nospace() << "QFlags(" << Qt::hex << Qt::showbase;
     bool needSeparator = false;
     for (uint i = 0; i < sizeofT * 8; ++i) {
         if (value & (Int(1) << i)) {