diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2014-06-27 15:56:55 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2014-06-30 11:40:24 +0200 |
| commit | 8638895f6be4bd6566e771603a42f9f99b0c1d97 (patch) | |
| tree | 41153c66bde3e5008302be691bdb0ca89fd57c8d /tests/auto/network | |
| parent | 190bb186aefe920ceaf5c464a88812e59d95e5e4 (diff) | |
Android: Fix compilation of qtcpsocket test
No pthread_yield() in the Android NDK.
Change-Id: I5ff77c55f30c172ee7fefb1129bdf475b318449e
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'tests/auto/network')
| -rw-r--r-- | tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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()) { |