diff options
Diffstat (limited to 'tests/auto/network-settings.h')
| -rw-r--r-- | tests/auto/network-settings.h | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 9488fda..9b67910 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -37,12 +37,10 @@ ** ****************************************************************************/ #include <QString> - -/* #ifdef QT_NETWORK_LIB #include <QtNetwork/QHostInfo> #endif -*/ + #ifdef Q_OS_SYMBIAN #include <sys/socket.h> @@ -131,7 +129,9 @@ public: //return "qt-test-server.wildcard.dev." + serverDomainName(); return "qttest.wildcard.dev." + serverDomainName(); } - static const char *serverIP() + +#ifdef QT_NETWORK_LIB + static QHostAddress serverIP() { #ifdef Q_OS_SYMBIAN loadTestSettings(); @@ -141,12 +141,13 @@ public: if(serverIp.isNull()) { serverIp = entry->recordValue().toAscii(); } - return serverIp.data(); + return QHostAddress(serverIp.data()); } -#endif - return "10.10.14.172"; +#endif + return QHostInfo::fromName(serverName()).addresses().first(); } - +#endif + static QByteArray expectedReplyIMAP() { #ifdef Q_OS_SYMBIAN @@ -315,14 +316,6 @@ private: } #endif -/* -#ifdef QT_NETWORK_LIB - static QHostAddress serverIP() - { - return QHostInfo::fromName(serverName()).addresses().first(); - } -#endif -*/ }; #ifdef Q_OS_SYMBIAN |