From 983d9e0c1a93a8f4350fa5c7f1ec4809e15e0d6e Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Sun, 16 Oct 2016 12:35:44 +0200
Subject: 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>
---
 src/dbus/qdbusserver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/dbus/qdbusserver.cpp')

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();
 }
-- 
cgit v1.2.3