Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
index d4daea2eb3..8e7b8df120 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
@@ -59,9 +59,9 @@ class QIBusFilterEventWatcher: public QDBusPendingCallWatcher
 {
 public:
     explicit QIBusFilterEventWatcher(const QDBusPendingCall &call,
-                                     QObject *parent = 0,
-                                     QWindow *window = 0,
-                                     const Qt::KeyboardModifiers modifiers = 0,
+                                     QObject *parent = nullptr,
+                                     QWindow *window = nullptr,
+                                     const Qt::KeyboardModifiers modifiers = nullptr,
                                      const QVariantList arguments = QVariantList())
     : QDBusPendingCallWatcher(call, parent)
     , m_window(window)