diff --git a/core/daemon.cpp b/core/daemon.cpp
index 4a77ea2d2..99fe2f147 100644
--- a/core/daemon.cpp
+++ b/core/daemon.cpp
@@ -164,7 +164,7 @@ Device*Daemon::getDevice(const QString& deviceId)
             return device;
         }
     }
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 QStringList Daemon::devices(bool onlyReachable, bool onlyTrusted) const
diff --git a/core/filetransferjob.cpp b/core/filetransferjob.cpp
index 9a92a917f..525c89860 100644
--- a/core/filetransferjob.cpp
+++ b/core/filetransferjob.cpp
@@ -32,7 +32,7 @@
 FileTransferJob::FileTransferJob(const QSharedPointer<QIODevice>& origin, qint64 size, const QUrl& destination)
     : KJob()
     , m_origin(origin)
-    , m_reply(Q_NULLPTR)
+    , m_reply(nullptr)
     , m_from(QStringLiteral("KDE Connect"))
     , m_destination(destination)
     , m_speedBytes(0)
diff --git a/core/pluginloader.cpp b/core/pluginloader.cpp
index 756aa8bce..d853d3bfb 100644
--- a/core/pluginloader.cpp
+++ b/core/pluginloader.cpp
@@ -57,7 +57,7 @@ KPluginMetaData PluginLoader::getPluginInfo(const QString& name) const
 
 KdeConnectPlugin* PluginLoader::instantiatePluginForDevice(const QString& pluginName, Device* device) const
 {
-    KdeConnectPlugin* ret = Q_NULLPTR;
+    KdeConnectPlugin* ret = nullptr;
 
     KPluginMetaData service = plugins.value(pluginName);
     if (!service.isValid()) {
diff --git a/daemon/kdeconnectd.cpp b/daemon/kdeconnectd.cpp
index d4fe15ea9..c451fd6f2 100644
--- a/daemon/kdeconnectd.cpp
+++ b/daemon/kdeconnectd.cpp
@@ -38,9 +38,9 @@ class DesktopDaemon : public Daemon
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.kdeconnect.daemon")
 public:
-    DesktopDaemon(QObject* parent = Q_NULLPTR)
+    DesktopDaemon(QObject* parent = nullptr)
         : Daemon(parent)
-        , m_nam(Q_NULLPTR)
+        , m_nam(nullptr)
     {}
 
     void askPairingConfirmation(Device* device) override
diff --git a/interfaces/devicessortproxymodel.h b/interfaces/devicessortproxymodel.h
index a342c2e2c..435aee56d 100644
--- a/interfaces/devicessortproxymodel.h
+++ b/interfaces/devicessortproxymodel.h
@@ -30,7 +30,7 @@ class KDECONNECTINTERFACES_EXPORT DevicesSortProxyModel : public QSortFilterProx
 {
     Q_OBJECT
 public:
-    explicit DevicesSortProxyModel(DevicesModel* devicesModel = Q_NULLPTR);
+    explicit DevicesSortProxyModel(DevicesModel* devicesModel = nullptr);
     bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
     bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
     void setSourceModel(QAbstractItemModel* sourceModel) override;
diff --git a/sfos/sailfishdaemon.cpp b/sfos/sailfishdaemon.cpp
index 211843c05..1541fdd73 100644
--- a/sfos/sailfishdaemon.cpp
+++ b/sfos/sailfishdaemon.cpp
@@ -39,7 +39,7 @@ class SailfishDaemon : public Daemon
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.kdeconnect.daemon")
 public:
-    SailfishDaemon(QObject* parent = Q_NULLPTR)
+    SailfishDaemon(QObject* parent = nullptr)
         : Daemon(parent)
         , m_background(new BackgroundActivity())
     {
diff --git a/tests/testdaemon.h b/tests/testdaemon.h
index 99b263dad..15e890625 100644
--- a/tests/testdaemon.h
+++ b/tests/testdaemon.h
@@ -27,9 +27,9 @@
 class TestDaemon : public Daemon
 {
 public:
-    TestDaemon(QObject* parent = Q_NULLPTR)
+    TestDaemon(QObject* parent = nullptr)
         : Daemon(parent, true)
-        , m_nam(Q_NULLPTR)
+        , m_nam(nullptr)
     {
     }