AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: tst_qthread: terminate is not supported

Browse Source 
"terminate" and "terminated" both fail on Android since
QThread::terminate not supported on Android. So we should skip them.

Task-number: QTBUG-68596
Change-Id: Id0d1dde2cfa02bb2978e5dd16087bf8f3bf112b0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Mårten Nordheim 2018-06-08 12:42:58 +02:00
parent ee3ed1a0ab
commit 06044df0e3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/corelib/thread/qthread/tst_qthread.cpp
View File

@ -465,8 +465,8 @@ void tst_QThread::start()
void tst_QThread::terminate() void tst_QThread::terminate()
{ {
#if defined(Q_OS_WINRT) #if defined(Q_OS_WINRT) || defined(Q_OS_ANDROID)
QSKIP("Thread termination is not supported on WinRT."); QSKIP("Thread termination is not supported on WinRT or Android.");
#endif #endif
Terminate_Thread thread; Terminate_Thread thread;
{ {
@ -531,8 +531,8 @@ void tst_QThread::finished()
void tst_QThread::terminated() void tst_QThread::terminated()
{ {
#if defined(Q_OS_WINRT) #if defined(Q_OS_WINRT) || defined(Q_OS_ANDROID)
QSKIP("Thread termination is not supported on WinRT."); QSKIP("Thread termination is not supported on WinRT or Android.");
#endif #endif
SignalRecorder recorder; SignalRecorder recorder;
Terminate_Thread thread; Terminate_Thread thread;