Android: tst_qthread: terminate is not supported
"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:
parent
ee3ed1a0ab
commit
06044df0e3
@ -465,8 +465,8 @@ void tst_QThread::start()
|
||||
|
||||
void tst_QThread::terminate()
|
||||
{
|
||||
#if defined(Q_OS_WINRT)
|
||||
QSKIP("Thread termination is not supported on WinRT.");
|
||||
#if defined(Q_OS_WINRT) || defined(Q_OS_ANDROID)
|
||||
QSKIP("Thread termination is not supported on WinRT or Android.");
|
||||
#endif
|
||||
Terminate_Thread thread;
|
||||
{
|
||||
@ -531,8 +531,8 @@ void tst_QThread::finished()
|
||||
|
||||
void tst_QThread::terminated()
|
||||
{
|
||||
#if defined(Q_OS_WINRT)
|
||||
QSKIP("Thread termination is not supported on WinRT.");
|
||||
#if defined(Q_OS_WINRT) || defined(Q_OS_ANDROID)
|
||||
QSKIP("Thread termination is not supported on WinRT or Android.");
|
||||
#endif
|
||||
SignalRecorder recorder;
|
||||
Terminate_Thread thread;
|
||||
|
Loading…
Reference in New Issue
Block a user