1 --- ./qtbase/src/corelib/thread/qthread_unix.cpp 2017-06-28 15:24:29.000000000 +0530
2 +++ ../qthread_unix.cpp 2017-07-19 20:19:40.071681378 +0530
7 -#if defined(Q_OS_DARWIN) || !defined(Q_OS_ANDROID) && !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0)
8 +#if !defined(__ANDROID__) && (defined(Q_OS_DARWIN) || !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0))
9 #define QT_HAS_THREAD_PRIORITY_SCHEDULING
14 void *QThreadPrivate::start(void *arg)
16 -#if !defined(Q_OS_ANDROID)
17 +#if !defined(__ANDROID__)
18 pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
20 pthread_cleanup_push(QThreadPrivate::finish, arg);
24 emit thr->started(QThread::QPrivateSignal());
25 -#if !defined(Q_OS_ANDROID)
26 +#if !defined(__ANDROID__)
27 pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
32 void QThread::terminate()
34 -#if !defined(Q_OS_ANDROID)
35 +#if !defined(__ANDROID__)
37 QMutexLocker locker(&d->mutex);
40 "Current thread was not started with QThread.");
43 -#if defined(Q_OS_ANDROID)
44 +#if defined(__ANDROID__)
47 pthread_setcancelstate(enabled ? PTHREAD_CANCEL_ENABLE : PTHREAD_CANCEL_DISABLE, NULL);