diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2022-02-09 15:29:03 +0100 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2022-02-15 14:04:07 +0000 |
| commit | a6acabb04c5872f258170dbe69304da72241fc74 (patch) | |
| tree | 92931ad11b7a50aad407972760166011876cbca5 /tests | |
| parent | a4b43e0d15da15615231cde3173c607c7c47988b (diff) | |
Activate tst_QFutureWatcher for Android
tst_QFutureWatcher was deactivated for Android. This patch activates it.
Fixes: QTBUG-88136
Change-Id: Iead82e22d73eb15c9ecd2756eb33925910bbffc0
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
(cherry picked from commit 936771d9013b283e5d9a586e77ef1f67d1618509)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/thread/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/corelib/thread/CMakeLists.txt b/tests/auto/corelib/thread/CMakeLists.txt index 08df798b0b..2ea5d23073 100644 --- a/tests/auto/corelib/thread/CMakeLists.txt +++ b/tests/auto/corelib/thread/CMakeLists.txt @@ -36,7 +36,7 @@ if(QT_FEATURE_thread) endif() # special case begin # QTBUG-87431 -if(TARGET Qt::Concurrent AND NOT ANDROID AND NOT INTEGRITY) +if(TARGET Qt::Concurrent AND NOT INTEGRITY) add_subdirectory(qfuturewatcher) endif() # special case end diff --git a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp index 34068f4f51..4ba87b165f 100644 --- a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp +++ b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp @@ -525,7 +525,8 @@ void tst_QFutureWatcher::tooMuchProgress() QObject::connect(&f, SIGNAL(progressValueChanged(int)), &o, SLOT(registerProgress(int))); f.setFuture((new ProgressEmitterTask())->start()); - QTestEventLoop::instance().enterLoop(5); + // Android reports ca. 10k progressValueChanged per second + QTestEventLoop::instance().enterLoop(15); QVERIFY(!QTestEventLoop::instance().timeout()); QVERIFY(progressValues.contains(maxProgress)); } |