diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-06-16 11:44:59 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-06-16 11:44:59 (GMT) |
| commit | 8de706d342b31b863e9e7b8eb222a0cb2ab57054 (patch) | |
| tree | 40966319d53ebf7d706c8d1edc3f5354a2af4da3 | |
| parent | de3e3d6bff2b585524cd504cf052cf181a6c2eae (diff) | |
| download | Qt-8de706d342b31b863e9e7b8eb222a0cb2ab57054.zip Qt-8de706d342b31b863e9e7b8eb222a0cb2ab57054.tar.gz Qt-8de706d342b31b863e9e7b8eb222a0cb2ab57054.tar.bz2 | |
Fix Qt network autotest compilation for ARMV5.
The build was broken by commit:
7604f8087f88171ef933d8ae08f501467e647338
| -rw-r--r-- | tests/auto/network-settings.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 0924c57..01a732c 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -50,7 +50,8 @@ #include <QSharedPointer> #include <QHash> #endif -#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) +#if defined(Q_OS_SYMBIAN) +#if defined(Q_CC_NOKIAX86) // In emulator we use WINSOCK connectivity by default. Unfortunately winsock // does not work very well with UDP sockets. This defines skips some test // cases which have known problems. @@ -59,6 +60,7 @@ // network tests. WINPCAP connectivity uses Symbian OS IP stack, // correspondingly as HW does. When using WINPCAP disable this define //#define SYMBIAN_WINSOCK_CONNECTIVITY +#endif // Q_CC_NOKIAX86 class QtNetworkSettingsRecord { public: @@ -80,7 +82,7 @@ private: QString strRecordValue; }; -#endif +#endif // Q_OS_SYMBIAN class QtNetworkSettings { |