diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/concurrent/concurrent.pro | 1 | ||||
-rw-r--r-- | tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp | 2 | ||||
-rw-r--r-- | tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro | 2 | ||||
-rw-r--r-- | tests/auto/corelib/thread/qfuture/.gitignore (renamed from tests/auto/concurrent/qfuture/.gitignore) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/thread/qfuture/qfuture.pro (renamed from tests/auto/concurrent/qfuture/qfuture.pro) | 2 | ||||
-rw-r--r-- | tests/auto/corelib/thread/qfuture/tst_qfuture.cpp (renamed from tests/auto/concurrent/qfuture/tst_qfuture.cpp) | 4 | ||||
-rw-r--r-- | tests/auto/corelib/thread/thread.pro | 1 |
7 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/concurrent/concurrent.pro b/tests/auto/concurrent/concurrent.pro index c87ae9e673..80d19d30ec 100644 --- a/tests/auto/concurrent/concurrent.pro +++ b/tests/auto/concurrent/concurrent.pro @@ -1,6 +1,5 @@ TEMPLATE=subdirs SUBDIRS=\ - qfuture \ qfuturesynchronizer \ qfuturewatcher \ qtconcurrentfilter \ diff --git a/tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp b/tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp index dbf957c85b..5d643a47f1 100644 --- a/tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp +++ b/tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp @@ -42,7 +42,7 @@ #include <QtTest> #include <QtConcurrent/qfuturesynchronizer.h> -#include <QtConcurrent/qfuture.h> +#include <QtCore/qfuture.h> class tst_QFutureSynchronizer : public QObject { diff --git a/tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro b/tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro index fbe577670f..17c0363ce4 100644 --- a/tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro +++ b/tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro @@ -1,5 +1,5 @@ CONFIG += testcase parallel_test TARGET = tst_qfuturewatcher -QT = core concurrent-private testlib concurrent +QT = core core-private testlib concurrent SOURCES = tst_qfuturewatcher.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/concurrent/qfuture/.gitignore b/tests/auto/corelib/thread/qfuture/.gitignore index 77c055c874..77c055c874 100644 --- a/tests/auto/concurrent/qfuture/.gitignore +++ b/tests/auto/corelib/thread/qfuture/.gitignore diff --git a/tests/auto/concurrent/qfuture/qfuture.pro b/tests/auto/corelib/thread/qfuture/qfuture.pro index 794bcfd6d7..36853de2f0 100644 --- a/tests/auto/concurrent/qfuture/qfuture.pro +++ b/tests/auto/corelib/thread/qfuture/qfuture.pro @@ -1,6 +1,6 @@ CONFIG += testcase parallel_test TARGET = tst_qfuture -QT = core concurrent-private testlib concurrent +QT = core core-private testlib concurrent SOURCES = tst_qfuture.cpp DEFINES += QT_STRICT_ITERATORS DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/concurrent/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp index ebf545f128..81ba1b0fd9 100644 --- a/tests/auto/concurrent/qfuture/tst_qfuture.cpp +++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp @@ -1297,8 +1297,8 @@ QFuture<int> createExceptionResultFuture() class DerivedException : public QException { public: - void raise() const { throw *this; } - DerivedException *clone() const { return new DerivedException(*this); } + void raise() const Q_DECL_OVERRIDE { throw *this; } + DerivedException *clone() const Q_DECL_OVERRIDE { return new DerivedException(*this); } }; QFuture<void> createDerivedExceptionFuture() diff --git a/tests/auto/corelib/thread/thread.pro b/tests/auto/corelib/thread/thread.pro index 8f063ee746..0d3f442542 100644 --- a/tests/auto/corelib/thread/thread.pro +++ b/tests/auto/corelib/thread/thread.pro @@ -3,6 +3,7 @@ SUBDIRS=\ qatomicint \ qatomicpointer \ qresultstore \ + qfuture \ qmutex \ qmutexlocker \ qreadlocker \ |