Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp

Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074

1 files changed, 4 insertions, 3 deletions

diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h
index bd7014bdf9..6bb1e2241f 100644
--- a/src/dbus/qdbuserror.h
+++ b/src/dbus/qdbuserror.h
@@ -100,8 +100,8 @@ public:
     QDBusError(const QDBusError &other);
 #ifdef Q_COMPILER_RVALUE_REFS
     QDBusError(QDBusError &&other) Q_DECL_NOTHROW
-        : code(other.code), msg(std::move(other.msg)), nm(std::move(other.nm)), unused(other.unused)
-    { other.unused = Q_NULLPTR; }
+        : code(other.code), msg(std::move(other.msg)), nm(std::move(other.nm))
+    {}
     QDBusError &operator=(QDBusError &&other) Q_DECL_NOTHROW { swap(other); return *this; }
 #endif
     QDBusError &operator=(const QDBusError &other);
@@ -114,7 +114,6 @@ public:
         qSwap(code,   other.code);
         qSwap(msg,    other.msg);
         qSwap(nm,     other.nm);
-        qSwap(unused, other.unused);
     }
 
     ErrorType type() const;
@@ -128,6 +127,8 @@ private:
     ErrorType code;
     QString msg;
     QString nm;
+    // ### This class has an implicit (therefore inline) destructor
+    // so the following field cannot be used:
     void *unused;
 };
 Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusError)