1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Activate tst_QFutureWatcher for Android

Browse Source 
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>
This commit is contained in:
Andreas Buhr 2022-02-09 15:29:03 +01:00
parent 23fd249b85
commit 936771d901
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/thread/CMakeLists.txt
View File

@ -36,7 +36,7 @@ if(QT_FEATURE_thread)
endif() endif()
# special case begin # special case begin
# QTBUG-87431 # QTBUG-87431
if(TARGET Qt::Concurrent AND NOT ANDROID AND NOT INTEGRITY) if(TARGET Qt::Concurrent AND NOT INTEGRITY)
add_subdirectory(qfuturewatcher) add_subdirectory(qfuturewatcher)
endif() endif()
# special case end # special case end

3
tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
View File

@ -525,7 +525,8 @@ void tst_QFutureWatcher::tooMuchProgress()
QObject::connect(&f, SIGNAL(progressValueChanged(int)), &o, SLOT(registerProgress(int))); QObject::connect(&f, SIGNAL(progressValueChanged(int)), &o, SLOT(registerProgress(int)));
f.setFuture((new ProgressEmitterTask())->start()); 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(!QTestEventLoop::instance().timeout());
QVERIFY(progressValues.contains(maxProgress)); QVERIFY(progressValues.contains(maxProgress));
} }