diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-02-03 14:36:42 +0300 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-02-06 10:06:48 +0000 |
| commit | bd18f49a9cd5f7547c34d0eb8a9dabc6a060bec8 (patch) | |
| tree | fa5e5f1777d12f519e2cb899a2b84e7581b4eefc /src/dbus | |
| parent | 3cbf926432b691bb2b5a64a033725a59e5055dc1 (diff) | |
Use Q_NULLPTR in qDBusRegisterMetaType
... to make user code buildable with gcc [-Werror=zero-as-null-pointer-constant].
Change-Id: Ifef52e406c1f7d5a260612ec27922d1805aea6e2
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
(cherry picked from commit 0e168f2c4e6f4ce3b98e86d9b140ee9fc3a9cf00)
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusmetatype.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusmetatype.h b/src/dbus/qdbusmetatype.h index bc051fbd32..273b4b9bbb 100644 --- a/src/dbus/qdbusmetatype.h +++ b/src/dbus/qdbusmetatype.h @@ -67,7 +67,7 @@ void qDBusDemarshallHelper(const QDBusArgument &arg, T *t) template<typename T> int qDBusRegisterMetaType( #ifndef Q_QDOC - T * /* dummy */ = 0 + T * /* dummy */ = Q_NULLPTR #endif ) { |