Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

2 files changed, 18 insertions, 31 deletions

diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
index b864b065e6..b5486307a7 100644
--- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
+++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
@@ -127,14 +127,11 @@ void tst_QtConcurrentMap::map()
         QtConcurrent::map(numberList.begin(), numberList.end(), &Number::multiplyBy2).waitForFinished();
         QCOMPARE(numberList, QList<Number>() << 4 << 8 << 12);
 
-#ifdef Q_COMPILER_LAMBDA
         // lambda
         QtConcurrent::map(list, [](int &x){x *= 2;}).waitForFinished();
         QCOMPARE(list, QList<int>() << 128 << 256 << 384);
         QtConcurrent::map(list.begin(), list.end(), [](int &x){x *= 2;}).waitForFinished();
         QCOMPARE(list, QList<int>() << 256 << 512 << 768);
-#endif
-
     }
 
     // functors don't take arguments by reference, making these no-ops
@@ -160,13 +157,11 @@ void tst_QtConcurrentMap::map()
         QtConcurrent::map(list.begin(), list.end(), multiplyBy2Immutable).waitForFinished();
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
 
-#ifdef Q_COMPILER_LAMBDA
         // lambda
         QtConcurrent::map(list, [](int x){x *= 2;}).waitForFinished();
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QtConcurrent::map(list.begin(), list.end(), [](int x){x *= 2;}).waitForFinished();
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
-#endif
     }
 
     // Linked lists and forward iterators
@@ -2026,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;
 }
@@ -2046,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();
 }
@@ -2066,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;
 }
@@ -2101,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 1596a9fafd..8506d18dae 100644
--- a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
+++ b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -48,12 +48,8 @@ private slots:
 #ifndef QT_NO_EXCEPTIONS
     void exceptions();
 #endif
-#ifdef Q_COMPILER_DECLTYPE
     void functor();
-#endif
-#ifdef Q_COMPILER_LAMBDA
     void lambda();
-#endif
 };
 
 void light()
@@ -126,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()
@@ -648,7 +644,6 @@ void tst_QtConcurrentRun::exceptions()
 }
 #endif
 
-#ifdef Q_COMPILER_DECLTYPE
 // Compiler supports decltype
 struct Functor {
     int operator()() { return 42; }
@@ -706,9 +701,7 @@ void tst_QtConcurrentRun::functor()
         QtConcurrent::run(&pool, f, 1,2,3,4,5).waitForFinished();
     }
 }
-#endif
 
-#ifdef Q_COMPILER_LAMBDA
 // Compiler supports lambda
 void tst_QtConcurrentRun::lambda()
 {
@@ -742,7 +735,6 @@ void tst_QtConcurrentRun::lambda()
     }
 #endif
 }
-#endif
 
 QTEST_MAIN(tst_QtConcurrentRun)
 #include "tst_qtconcurrentrun.moc"