2 files changed, 18 insertions, 18 deletions
diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
index 9b71994b84..b5486307a7 100644
--- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
+++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
@@ -2021,12 +2021,12 @@ int fn(int &i)
     return i;
 }
 
-int fnConstNoExcept(const int &i) Q_DECL_NOTHROW
+int fnConstNoExcept(const int &i) noexcept
 {
     return i;
 }
 
-int fnNoExcept(int &i) Q_DECL_NOTHROW
+int fnNoExcept(int &i) noexcept
 {
     return i;
 }
@@ -2041,12 +2041,12 @@ QString changeType(int &)
     return QString();
 }
 
-QString changeTypeConstNoExcept(const int &) Q_DECL_NOTHROW
+QString changeTypeConstNoExcept(const int &) noexcept
 {
     return QString();
 }
 
-QString changeTypeNoExcept(int &) Q_DECL_NOTHROW
+QString changeTypeNoExcept(int &) noexcept
 {
     return QString();
 }
@@ -2061,12 +2061,12 @@ int changeTypeQStringList(QStringList &)
     return 0;
 }
 
-int changeTypeQStringListConstNoExcept(const QStringList &) Q_DECL_NOTHROW
+int changeTypeQStringListConstNoExcept(const QStringList &) noexcept
 {
     return 0;
 }
 
-int changeTypeQStringListNoExcept(QStringList &) Q_DECL_NOTHROW
+int changeTypeQStringListNoExcept(QStringList &) noexcept
 {
     return 0;
 }
@@ -2096,22 +2096,22 @@ public:
         return QString();
     }
 
-    MemFnTester fnNoExcept() Q_DECL_NOTHROW
+    MemFnTester fnNoExcept() noexcept
     {
         return MemFnTester();
     }
 
-    MemFnTester fnConstNoExcept() const Q_DECL_NOTHROW
+    MemFnTester fnConstNoExcept() const noexcept
     {
         return MemFnTester();
     }
 
-    QString changeTypeNoExcept() Q_DECL_NOTHROW
+    QString changeTypeNoExcept() noexcept
     {
         return QString();
     }
 
-    QString changeTypeConstNoExcept() const Q_DECL_NOTHROW
+    QString changeTypeConstNoExcept() const noexcept
     {
         return QString();
     }
diff --git a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
index 9b5bb85fff..8506d18dae 100644
--- a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
+++ b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -122,23 +122,23 @@ public:
 class ANoExcept
 {
 public:
-    int member0() Q_DECL_NOTHROW { return 10; }
-    int member1(int in) Q_DECL_NOTHROW { return in; }
+    int member0() noexcept { return 10; }
+    int member1(int in) noexcept { return in; }
 
     typedef int result_type;
-    int operator()() Q_DECL_NOTHROW { return 10; }
-    int operator()(int in) Q_DECL_NOTHROW { return in; }
+    int operator()() noexcept { return 10; }
+    int operator()(int in) noexcept { return in; }
 };
 
 class AConstNoExcept
 {
 public:
-    int member0() const Q_DECL_NOTHROW { return 10; }
-    int member1(int in) const Q_DECL_NOTHROW { return in; }
+    int member0() const noexcept { return 10; }
+    int member1(int in) const noexcept { return in; }
 
     typedef int result_type;
-    int operator()() const Q_DECL_NOTHROW { return 10; }
-    int operator()(int in) const Q_DECL_NOTHROW { return in; }
+    int operator()() const noexcept { return 10; }
+    int operator()(int in) const noexcept { return in; }
 };
 
 void tst_QtConcurrentRun::returnValue()