From 8638895f6be4bd6566e771603a42f9f99b0c1d97 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Fri, 27 Jun 2014 15:56:55 +0200 Subject: Android: Fix compilation of qtcpsocket test No pthread_yield() in the Android NDK. Change-Id: I5ff77c55f30c172ee7fefb1129bdf475b318449e Reviewed-by: BogDan Vatra --- tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index fcf6315c1f..8e69d827a6 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -1976,9 +1976,9 @@ public slots: attemptedToConnect = true; sock->connectToHost(QtNetworkSettings::serverName(), 80); -#ifdef Q_OS_MAC +#if defined(Q_OS_MAC) pthread_yield_np(); -#elif defined Q_OS_LINUX +#elif defined Q_OS_LINUX && !defined Q_OS_ANDROID pthread_yield(); #endif if (!sock->waitForConnected()) { -- cgit v1.2.3