9 files changed, 6 insertions, 28 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
index 920a04315d..2cfd7e086c 100644
--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@@ -9,11 +9,11 @@ qtConfig(dbus-linked) {
 }
 
 win32 { 
-    LIBS_PRIVATE += \
-        -lws2_32 \
-        -ladvapi32 \
-        -lnetapi32 \
-        -luser32
+    QMAKE_USE_PRIVATE += \
+        advapi32 \
+        netapi32 \
+        user32 \
+        ws2_32
 }
 
 DEFINES += QT_NO_FOREACH
diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h
index 7f4bd269a9..b7cd4c8989 100644
--- a/src/dbus/qdbusargument.h
+++ b/src/dbus/qdbusargument.h
@@ -76,10 +76,8 @@ public:
 
     QDBusArgument();
     QDBusArgument(const QDBusArgument &other);
-#ifdef Q_COMPILER_RVALUE_REFS
     QDBusArgument(QDBusArgument &&other) noexcept : d(other.d) { other.d = nullptr; }
     QDBusArgument &operator=(QDBusArgument &&other) noexcept { swap(other); return *this; }
-#endif
     QDBusArgument &operator=(const QDBusArgument &other);
     ~QDBusArgument();
 
diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h
index a880a7a939..368f811602 100644
--- a/src/dbus/qdbusconnection.h
+++ b/src/dbus/qdbusconnection.h
@@ -131,10 +131,8 @@ public:
 
     explicit QDBusConnection(const QString &name);
     QDBusConnection(const QDBusConnection &other);
-#ifdef Q_COMPILER_RVALUE_REFS
     QDBusConnection(QDBusConnection &&other) noexcept : d(other.d) { other.d = nullptr; }
     QDBusConnection &operator=(QDBusConnection &&other) noexcept { swap(other); return *this; }
-#endif
     QDBusConnection &operator=(const QDBusConnection &other);
     ~QDBusConnection();
 
diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h
index 5a68a417c4..bcf68dbcdc 100644
--- a/src/dbus/qdbuserror.h
+++ b/src/dbus/qdbuserror.h
@@ -98,12 +98,10 @@ public:
 #endif
     QDBusError(ErrorType error, const QString &message);
     QDBusError(const QDBusError &other);
-#ifdef Q_COMPILER_RVALUE_REFS
     QDBusError(QDBusError &&other) noexcept
         : code(other.code), msg(std::move(other.msg)), nm(std::move(other.nm))
     {}
     QDBusError &operator=(QDBusError &&other) noexcept { swap(other); return *this; }
-#endif
     QDBusError &operator=(const QDBusError &other);
 #ifndef QT_BOOTSTRAPPED
     QDBusError &operator=(const QDBusMessage &msg);
diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h
index e2430ad6f2..fdac917947 100644
--- a/src/dbus/qdbusextratypes.h
+++ b/src/dbus/qdbusextratypes.h
@@ -66,9 +66,7 @@ public:
     inline explicit QDBusObjectPath(const char *path);
     inline explicit QDBusObjectPath(QLatin1String path);
     inline explicit QDBusObjectPath(const QString &path);
-#ifdef Q_COMPILER_RVALUE_REFS
     explicit QDBusObjectPath(QString &&p) : m_path(std::move(p)) { doCheck(); }
-#endif
 
     void swap(QDBusObjectPath &other) noexcept { qSwap(m_path, other.m_path); }
 
@@ -121,9 +119,7 @@ public:
     inline explicit QDBusSignature(const char *signature);
     inline explicit QDBusSignature(QLatin1String signature);
     inline explicit QDBusSignature(const QString &signature);
-#ifdef Q_COMPILER_RVALUE_REFS
     explicit QDBusSignature(QString &&sig) : m_signature(std::move(sig)) { doCheck(); }
-#endif
 
     void swap(QDBusSignature &other) noexcept { qSwap(m_signature, other.m_signature); }
 
@@ -173,9 +169,7 @@ public:
     // compiler-generated destructor is ok!
 
     inline explicit QDBusVariant(const QVariant &variant);
-#ifdef Q_COMPILER_RVALUE_REFS
     explicit QDBusVariant(QVariant &&v) noexcept : m_variant(std::move(v)) {}
-#endif
 
     void swap(QDBusVariant &other) noexcept { qSwap(m_variant, other.m_variant); }
 
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 16020aabb1..640acc2425 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -1330,8 +1330,6 @@ bool QDBusConnectionPrivate::prepareHook(QDBusConnectionPrivate::SignalHook &hoo
         hook.midx = findSlot(receiver, normalizedName, hook.params);
     }
     if (hook.midx < minMIdx) {
-        if (hook.midx == -1)
-        {}
         return false;
     }
 
diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h
index 3e73db70de..41845317c4 100644
--- a/src/dbus/qdbusmessage.h
+++ b/src/dbus/qdbusmessage.h
@@ -68,9 +68,7 @@ public:
 
     QDBusMessage();
     QDBusMessage(const QDBusMessage &other);
-#ifdef Q_COMPILER_RVALUE_REFS
     QDBusMessage &operator=(QDBusMessage &&other) noexcept { swap(other); return *this; }
-#endif
     QDBusMessage &operator=(const QDBusMessage &other);
     ~QDBusMessage();
 
diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h
index c521b7d163..dd99346301 100644
--- a/src/dbus/qdbuspendingcall.h
+++ b/src/dbus/qdbuspendingcall.h
@@ -60,9 +60,7 @@ class Q_DBUS_EXPORT QDBusPendingCall
 public:
     QDBusPendingCall(const QDBusPendingCall &other);
     ~QDBusPendingCall();
-#ifdef Q_COMPILER_RVALUE_REFS
     QDBusPendingCall &operator=(QDBusPendingCall &&other) noexcept { swap(other); return *this; }
-#endif
     QDBusPendingCall &operator=(const QDBusPendingCall &other);
 
     void swap(QDBusPendingCall &other) noexcept { qSwap(d, other.d); }
diff --git a/src/dbus/qdbusunixfiledescriptor.h b/src/dbus/qdbusunixfiledescriptor.h
index 6b264a6b86..fcd73b2ec5 100644
--- a/src/dbus/qdbusunixfiledescriptor.h
+++ b/src/dbus/qdbusunixfiledescriptor.h
@@ -46,9 +46,7 @@
 
 #ifndef QT_NO_DBUS
 
-#ifdef Q_COMPILER_RVALUE_REFS
-# include <utility>
-#endif
+#include <utility>
 
 QT_BEGIN_NAMESPACE
 
@@ -61,9 +59,7 @@ public:
     QDBusUnixFileDescriptor();
     explicit QDBusUnixFileDescriptor(int fileDescriptor);
     QDBusUnixFileDescriptor(const QDBusUnixFileDescriptor &other);
-#if defined(Q_COMPILER_RVALUE_REFS)
     QDBusUnixFileDescriptor &operator=(QDBusUnixFileDescriptor &&other) noexcept { swap(other); return *this; }
-#endif
     QDBusUnixFileDescriptor &operator=(const QDBusUnixFileDescriptor &other);
     ~QDBusUnixFileDescriptor();