summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2017-02-03 14:36:42 +0300
committerTony Sarajärvi <tony.sarajarvi@qt.io>2017-02-03 20:24:45 +0000
commit0e168f2c4e6f4ce3b98e86d9b140ee9fc3a9cf00 (patch)
tree37bf4e1547b83a496e3e54e748d8f64bbd295c30 /src/dbus
parentb8dbde10a065c3ba95b794b6d53ff62e8ca22ee7 (diff)
Use 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>
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/qdbusmetatype.h2
1 files changed, 1 insertions, 1 deletions
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<typename T>
int qDBusRegisterMetaType(
#ifndef Q_QDOC
- T * /* dummy */ = 0
+ T * /* dummy */ = nullptr
#endif
)
{