diff options
Diffstat (limited to 'tests/auto/tools/moc/tst_moc.cpp')
| -rw-r--r-- | tests/auto/tools/moc/tst_moc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index 55e8054a70..753da401a2 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -43,7 +43,7 @@ #include "pure-virtual-signals.h" #include "qinvokable.h" // msvc and friends crap out on it -#if !defined(Q_CC_GNU) || defined(Q_OS_IRIX) || defined(Q_OS_WIN) +#if !defined(Q_CC_GNU) || defined(Q_OS_WIN) #define SKIP_NEWLINE_TEST #endif #if !defined(SKIP_NEWLINE_TEST) @@ -163,7 +163,7 @@ class CreatableGadget public: Q_INVOKABLE CreatableGadget() { - CreatableGadget::qt_static_metacall((QObject*)this, QMetaObject::ReadProperty, -1, Q_NULLPTR); + CreatableGadget::qt_static_metacall((QObject*)this, QMetaObject::ReadProperty, -1, nullptr); } }; @@ -223,7 +223,7 @@ namespace { { Q_OBJECT public: - explicit ObjectInUnnamedNS(QObject *parent = Q_NULLPTR) : QObject(parent) {} + explicit ObjectInUnnamedNS(QObject *parent = nullptr) : QObject(parent) {} }; } @@ -3768,7 +3768,7 @@ void tst_Moc::veryLongStringData() void tst_Moc::gadgetHierarchy() { - QCOMPARE(NonGadgetParent::Derived::staticMetaObject.superClass(), static_cast<const QMetaObject*>(Q_NULLPTR)); + QCOMPARE(NonGadgetParent::Derived::staticMetaObject.superClass(), static_cast<const QMetaObject*>(nullptr)); QCOMPARE(GrandParentGadget::DerivedGadget::staticMetaObject.superClass(), &GrandParentGadget::BaseGadget::staticMetaObject); } |