summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusconnection.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/dbus/qdbusconnection.h')
-rw-r--r--src/dbus/qdbusconnection.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h
index ba28938b60..ca7adfaaeb 100644
--- a/src/dbus/qdbusconnection.h
+++ b/src/dbus/qdbusconnection.h
@@ -47,6 +47,10 @@
#ifndef QT_NO_DBUS
+#ifdef interface
+# undef interface
+#endif
+
QT_BEGIN_NAMESPACE
@@ -130,7 +134,7 @@ public:
explicit QDBusConnection(const QString &name);
QDBusConnection(const QDBusConnection &other);
#ifdef Q_COMPILER_RVALUE_REFS
- QDBusConnection(QDBusConnection &&other) Q_DECL_NOTHROW : d(other.d) { other.d = Q_NULLPTR; }
+ QDBusConnection(QDBusConnection &&other) Q_DECL_NOTHROW : d(other.d) { other.d = nullptr; }
QDBusConnection &operator=(QDBusConnection &&other) Q_DECL_NOTHROW { swap(other); return *this; }
#endif
QDBusConnection &operator=(const QDBusConnection &other);