3 files changed, 25 insertions, 25 deletions

diff --git a/tests/auto/tools/moc/cxx11-explicit-override-control.h b/tests/auto/tools/moc/cxx11-explicit-override-control.h
index f361a47248..2211112717 100644
--- a/tests/auto/tools/moc/cxx11-explicit-override-control.h
+++ b/tests/auto/tools/moc/cxx11-explicit-override-control.h
@@ -132,17 +132,17 @@ public:
         : ExplicitOverrideControlBase(parent) {}
 
 private Q_SLOTS:
-    void pureSlot0() Q_DECL_OVERRIDE {}
-    void pureSlot1() Q_DECL_OVERRIDE {}
-    void pureSlot2() const Q_DECL_OVERRIDE {}
-    void pureSlot3() Q_DECL_OVERRIDE const {}
+    void pureSlot0() override {}
+    void pureSlot1() override {}
+    void pureSlot2() const override {}
+    void pureSlot3() override const {}
 #if 0 // moc doesn't support volatile slots
-    void pureSlot4() volatile Q_DECL_OVERRIDE {}
-    void pureSlot5() Q_DECL_OVERRIDE volatile {}
-    void pureSlot6() const volatile Q_DECL_OVERRIDE {}
-    void pureSlot7() volatile Q_DECL_OVERRIDE const {}
-    void pureSlot8() const Q_DECL_OVERRIDE volatile {}
-    void pureSlot9() Q_DECL_OVERRIDE volatile const {}
+    void pureSlot4() volatile override {}
+    void pureSlot5() override volatile {}
+    void pureSlot6() const volatile override {}
+    void pureSlot7() volatile override const {}
+    void pureSlot8() const override volatile {}
+    void pureSlot9() override volatile const {}
 #endif
 };
 
@@ -176,17 +176,17 @@ public:
         : ExplicitOverrideControlBase(parent) {}
 
 private Q_SLOTS:
-    void pureSlot0() Q_DECL_FINAL Q_DECL_OVERRIDE {}
-    void pureSlot1() Q_DECL_OVERRIDE Q_DECL_FINAL {}
-    void pureSlot2() Q_DECL_OVERRIDE const Q_DECL_FINAL {}
-    void pureSlot3() Q_DECL_FINAL const Q_DECL_OVERRIDE {}
+    void pureSlot0() Q_DECL_FINAL override {}
+    void pureSlot1() override Q_DECL_FINAL {}
+    void pureSlot2() override const Q_DECL_FINAL {}
+    void pureSlot3() Q_DECL_FINAL const override {}
 #if 0 // moc doesn't support volatile slots
-    void pureSlot4() volatile Q_DECL_FINAL Q_DECL_OVERRIDE {}
-    void pureSlot5() Q_DECL_OVERRIDE Q_DECL_FINAL volatile {}
-    void pureSlot6() Q_DECL_OVERRIDE const volatile Q_DECL_FINAL {}
-    void pureSlot7() volatile Q_DECL_OVERRIDE Q_DECL_FINAL const {}
-    void pureSlot8() const Q_DECL_FINAL Q_DECL_OVERRIDE volatile {}
-    void pureSlot9() Q_DECL_FINAL volatile const Q_DECL_OVERRIDE {}
+    void pureSlot4() volatile Q_DECL_FINAL override {}
+    void pureSlot5() override Q_DECL_FINAL volatile {}
+    void pureSlot6() override const volatile Q_DECL_FINAL {}
+    void pureSlot7() volatile override Q_DECL_FINAL const {}
+    void pureSlot8() const Q_DECL_FINAL override volatile {}
+    void pureSlot9() Q_DECL_FINAL volatile const override {}
 #endif
 };
 
diff --git a/tests/auto/tools/moc/moc.pro b/tests/auto/tools/moc/moc.pro
index b7151f9c16..d2b13f9c4e 100644
--- a/tests/auto/tools/moc/moc.pro
+++ b/tests/auto/tools/moc/moc.pro
@@ -32,7 +32,7 @@ HEADERS += using-namespaces.h no-keywords.h task87883.h c-comments.h backslash-n
            namespace.h cxx17-namespaces.h
 
 
-if(*-g++*|*-icc*|*-clang*|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win-newlines.h
+if(*-g++*|*-icc*|*-clang*|*-llvm):!win32-*: HEADERS += os9-newlines.h win-newlines.h
 if(*-g++*|*-clang*): HEADERS += dollars.h
 SOURCES += tst_moc.cpp
 
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);
 }