diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-06-16 12:08:42 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-06-16 12:08:42 (GMT) |
| commit | 228b2f6494ebd95fc66993b00ecab065ec5fe5a5 (patch) | |
| tree | 619c06fc6260363e94b7ae593b23e1c3b7711fc5 /tests/auto | |
| parent | 9d78e1132427ec803f08b2861ab27587ca72cfbf (diff) | |
| parent | 7243161097b1a7b72706aec09389dcb046da7d0f (diff) | |
| download | Qt-228b2f6494ebd95fc66993b00ecab065ec5fe5a5.zip Qt-228b2f6494ebd95fc66993b00ecab065ec5fe5a5.tar.gz Qt-228b2f6494ebd95fc66993b00ecab065ec5fe5a5.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'tests/auto')
| -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 { |