diff options
| -rw-r--r-- | tests/auto/qml/qml.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qml/testobject.h | 2 | ||||
| -rw-r--r-- | tests/auto/webchannel/tst_webchannel.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qml/qml.cpp b/tests/auto/qml/qml.cpp index 71eb1ac..24c0bbe 100644 --- a/tests/auto/qml/qml.cpp +++ b/tests/auto/qml/qml.cpp @@ -5,7 +5,7 @@ #include <QtQml/qqml.h> #ifndef QUICK_TEST_SOURCE_DIR -#define QUICK_TEST_SOURCE_DIR Q_NULLPTR +#define QUICK_TEST_SOURCE_DIR nullptr #endif #include "testtransport.h" diff --git a/tests/auto/qml/testobject.h b/tests/auto/qml/testobject.h index 39b07b1..ea23088 100644 --- a/tests/auto/qml/testobject.h +++ b/tests/auto/qml/testobject.h @@ -17,7 +17,7 @@ class TestObject : public QObject Q_PROPERTY(QVariantMap objectMap READ objectMap CONSTANT) Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty BINDABLE bindableStringProperty) public: - explicit TestObject(QObject *parent = Q_NULLPTR); + explicit TestObject(QObject *parent = nullptr); ~TestObject(); QVariantMap objectMap() const; diff --git a/tests/auto/webchannel/tst_webchannel.h b/tests/auto/webchannel/tst_webchannel.h index cf3757e..d6758ef 100644 --- a/tests/auto/webchannel/tst_webchannel.h +++ b/tests/auto/webchannel/tst_webchannel.h @@ -72,10 +72,10 @@ class TestObject : public QObject Q_PROPERTY(QString stringProperty READ readStringProperty WRITE setStringProperty BINDABLE bindableStringProperty) public: - explicit TestObject(QObject *parent = 0) + explicit TestObject(QObject *parent = nullptr) : QObject(parent) - , mObjectProperty(0) - , mReturnedObject(Q_NULLPTR) + , mObjectProperty(nullptr) + , mReturnedObject(nullptr) { } enum Foo { |