From a90c635d10184e8fbb0b48748cd7d7b088e50e14 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Thu, 7 Mar 2013 15:26:16 +0100 Subject: Android compile fix Android is not a proper Linux, and in particular it does not have pthread_yield(). Change-Id: Ibf94cfacdc24d0c3baaef002c64f9f50c72c01d2 Reviewed-by: Eskil Abrahamsen Blomfeldt --- tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/corelib/kernel/qmetatype') diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index 9a75bad549..77ea39da53 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -170,7 +170,7 @@ protected: const QByteArray name = QString("Bar%1_%2").arg(i).arg((size_t)QThread::currentThreadId()).toLatin1(); const char *nm = name.constData(); int tp = qRegisterMetaType(nm); -#ifdef Q_OS_LINUX +#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) pthread_yield(); #endif QMetaType info(tp); -- cgit v1.2.3