From 0e168f2c4e6f4ce3b98e86d9b140ee9fc3a9cf00 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Fri, 3 Feb 2017 14:36:42 +0300 Subject: [PATCH] Use nullptr in qDBusRegisterMetaType ... to make user code buildable with gcc [-Werror=zero-as-null-pointer-constant]. Change-Id: Ifef52e406c1f7d5a260612ec27922d1805aea6e2 Reviewed-by: Marc Mutz --- src/dbus/qdbusmetatype.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dbus/qdbusmetatype.h b/src/dbus/qdbusmetatype.h index 9f3d9019d7..e241553bb4 100644 --- a/src/dbus/qdbusmetatype.h +++ b/src/dbus/qdbusmetatype.h @@ -74,7 +74,7 @@ void qDBusDemarshallHelper(const QDBusArgument &arg, T *t) template int qDBusRegisterMetaType( #ifndef Q_QDOC - T * /* dummy */ = 0 + T * /* dummy */ = nullptr #endif ) {