summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2016-10-16 12:35:44 +0200
committerhjk <hjk@qt.io>2016-10-18 08:04:45 +0000
commit983d9e0c1a93a8f4350fa5c7f1ec4809e15e0d6e (patch)
treea3a5cfbe11aad9cba39daec3d50f65cea261c41b /src
parent4ebe8cefde2ee70753d710b4355d24e237d93366 (diff)
Fix DBus compilation
Don't use C++11 nullptr in 5.6. Change-Id: I57e9595b2e1cede995eed09878bf02ee30482659 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net>
Diffstat (limited to 'src')
-rw-r--r--src/dbus/qdbusserver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp
index 39d08b4e63..0833134bb3 100644
--- a/src/dbus/qdbusserver.cpp
+++ b/src/dbus/qdbusserver.cpp
@@ -105,7 +105,7 @@ QDBusServer::~QDBusServer()
}
d->serverConnectionNames.clear();
}
- d->serverObject = nullptr;
+ d->serverObject = Q_NULLPTR;
d->ref.store(0);
d->deleteLater();
}