diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index 2ef1093c17f..a9b141f7cdd 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -417,8 +417,8 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- bool QObject::disconnect(const char *signal = Q_NULLPTR, const QObject *receiver = Q_NULLPTR, const char *method = Q_NULLPTR) const -->
-  <!-- bool QObject::disconnect(const QObject *receiver, const char *method = Q_NULLPTR) const -->
+  <!-- bool QObject::disconnect(const char *signal = nullptr, const QObject *receiver = nullptr, const char *method = nullptr) const -->
+  <!-- bool QObject::disconnect(const QObject *receiver, const char *method = nullptr) const -->
   <!-- bool QObject::disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *method) // static -->
   <!-- bool	QObject::disconnect(const QObject *sender, const QMetaMethod &signal, const QObject *receiver, const QMetaMethod &method) // static -->
   <!-- bool QObject::disconnect(const QMetaObject::Connection &connection) // static -->
@@ -467,7 +467,7 @@
       <not-uninit/>
     </arg>
   </function>
-  <!-- QString QObject::tr(const char *sourceText, const char *disambiguation = Q_NULLPTR, int n = -1) //static -->
+  <!-- QString QObject::tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1) //static -->
   <function name="tr,QObject::tr">
     <noreturn>false</noreturn>
     <returnValue type="QString"/>
@@ -2041,7 +2041,7 @@
     <use-retval/>
     <const/>
   </function>
-  <!-- int QString::toInt(bool *ok = Q_NULLPTR, int base = 10) const -->
+  <!-- int QString::toInt(bool *ok = nullptr, int base = 10) const -->
   <function name="QString::toInt">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
@@ -2459,9 +2459,9 @@
       <not-uninit/>
     </arg>
   </function>
-  <!-- QString QFileDialog::getOpenFileName(QWidget *parent = Q_NULLPTR, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = Q_NULLPTR, Options options = Options()) //static -->
-  <!-- QString QFileDialog::getSaveFileName(QWidget *parent = Q_NULLPTR, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = Q_NULLPTR, Options options = Options()) //static -->
-  <!-- QString QFileDialog::getExistingDirectory(QWidget *parent = Q_NULLPTR, const QString &caption = QString(), const QString &dir = QString(), Options options = ShowDirsOnly) //static -->
+  <!-- QString QFileDialog::getOpenFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, Options options = Options()) //static -->
+  <!-- QString QFileDialog::getSaveFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, Options options = Options()) //static -->
+  <!-- QString QFileDialog::getExistingDirectory(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), Options options = ShowDirsOnly) //static -->
   <function name="QFileDialog::getOpenFileName,QFileDialog::getSaveFileName,QFileDialog::getExistingDirectory">
     <noreturn>false</noreturn>
     <returnValue type="QString"/>
@@ -2470,7 +2470,7 @@
       <not-uninit/>
     </arg>
   </function>
-  <!-- QStringList QFileDialog::getOpenFileNames(QWidget *parent = Q_NULLPTR, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = Q_NULLPTR, Options options = Options()) //static -->
+  <!-- QStringList QFileDialog::getOpenFileNames(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, Options options = Options()) //static -->
   <function name="QFileDialog::getOpenFileNames">
     <noreturn>false</noreturn>
     <returnValue type="QStringList"/>
@@ -5325,7 +5325,7 @@
   <define name="Q_NAMESPACE_EXPORT" value=""/>
   <define name="Q_DECL_EXPORT" value=""/>
   <define name="Q_DECL_IMPORT" value=""/>
-  <define name="QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context)" value="static inline QString trUtf8(const char *sourceText, const char *disambiguation = Q_NULLPTR, int n = -1) { return QCoreApplication::translate(#context, sourceText, disambiguation, n); }"/>
+  <define name="QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context)" value="static inline QString trUtf8(const char *sourceText, const char *disambiguation = nullptr, int n = -1) { return QCoreApplication::translate(#context, sourceText, disambiguation, n); }"/>
   <define name="Q_DECLARE_FLAGS(x,y)" value=""/>
   <define name="Q_DECLARE_SEQUENTIAL_ITERATOR(C)" value=""/>
   <define name="Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(C)" value=""/>
@@ -5339,7 +5339,7 @@
   <define name="Q_DECLARE_PRIVATE(Class)" value="inline Class##Private* d_func() { return reinterpret_cast&lt;Class##Private*&gt;(qGetPtrHelper(d_ptr)); } inline const Class##Private d_func() const { return reinterpret_cast&lt;const Class##Private *&gt;(qGetPtrHelper(d_ptr)); } friend class Class##Private;"/>
   <define name="Q_DECLARE_PRIVATE_D(Dptr, Class)" value="inline Class##Private* d_func() { return reinterpret_cast&lt;Class##Private *&gt;(qGetPtrHelper(Dptr)); } inline const Class##Private* d_func() const { return reinterpret_cast&lt;const Class##Private *&gt;(qGetPtrHelper(Dptr)); } friend class Class##Private;"/>
   <define name="Q_DECLARE_PUBLIC(Class)" value="inline Class##Public* d_func() { return reinterpret_cast&lt;Class##Public*&gt;(qGetPtrHelper(d_ptr)); } inline const Class##Public d_func() const { return reinterpret_cast&lt;const Class##Public *&gt;(qGetPtrHelper(d_ptr)); } friend class Class##Public;"/>
-  <define name="Q_DECLARE_TR_FUNCTIONS(context)" value="public: static inline QString tr(const char *sourceText, const char *disambiguation = Q_NULLPTR, int n = -1) { return QCoreApplication::translate(#context, sourceText, disambiguation, n); } QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context) private:"/>
+  <define name="Q_DECLARE_TR_FUNCTIONS(context)" value="public: static inline QString tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1) { return QCoreApplication::translate(#context, sourceText, disambiguation, n); } QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context) private:"/>
   <define name="Q_DISABLE_COPY(C)" value="C(C&amp;);C&amp; operator=(const C&amp;);"/>
   <define name="Q_EMIT" value=""/>
   <define name="Q_ENUM(X)" value=""/>
@@ -5352,7 +5352,7 @@
   <define name="Q_INTERFACES(X)" value=""/>
   <define name="Q_LIKELY(expr)" value="expr"/>
   <define name="Q_NAMESPACE" value=""/>
-  <define name="Q_NULLPTR" value="NULL"/>
+  <define name="nullptr" value="NULL"/>
   <define name="Q_OBJECT" value="static void qt_static_metacall(QObject*,QMetaObject::Call,int,void**);const MetaObject* metaObject() const;void* qt_metacast(const char*);int qt_metacall(QMetaObject::Call,int,void**);"/>
   <define name="Q_PRIVATE_SLOT(d, signature)" value=""/>
   <define name="Q_SLOTS" value=""/>
diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
index b6d0ba760f9..b42c956ddf5 100644
--- a/test/cfg/qt.cpp
+++ b/test/cfg/qt.cpp
@@ -583,7 +583,7 @@ void validCode(int * pIntPtr, QString & qstrArg, double d)
     Q_UNUSED(d)
     if (QFile::exists("test")) {}
 
-    if (pIntPtr != Q_NULLPTR) {
+    if (pIntPtr != nullptr) {
         *pIntPtr = 5;
     }
 
@@ -627,11 +627,11 @@ void ignoredReturnValue()
 
 void nullPointer(int * pIntPtr)
 {
-    int * pNullPtr = Q_NULLPTR;
+    int * pNullPtr = nullptr;
     // cppcheck-suppress nullPointer
     *pNullPtr = 1;
 
-    if (pIntPtr != Q_NULLPTR) {
+    if (pIntPtr != nullptr) {
         *pIntPtr = 2;
     } else {
         // cppcheck-suppress nullPointerRedundantCheck