diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-11 09:52:05 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-11 09:52:05 (GMT) |
| commit | 0ec7c55b241d7f281e49edbd7b496f7b5be01305 (patch) | |
| tree | d0c9d4741327fd1dc57a0ec4755acc7977d5b79c /tests/auto/network-settings.h | |
| parent | f79228b71b05d28b83014f262bc47e3fe9557a14 (diff) | |
| parent | 7f7965212438405c64566416c0f8972f06d6dcd1 (diff) | |
| download | Qt-0ec7c55b241d7f281e49edbd7b496f7b5be01305.zip Qt-0ec7c55b241d7f281e49edbd7b496f7b5be01305.tar.gz Qt-0ec7c55b241d7f281e49edbd7b496f7b5be01305.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'tests/auto/network-settings.h')
| -rw-r--r-- | tests/auto/network-settings.h | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 9488fda..48ba8e8 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> @@ -98,9 +96,9 @@ public: return entry->recordValue(); } #endif - return QString("qttest"); + //return QString("qttest"); //return QString("aspiriniks"); - //return QString("qt-test-server"); + return QString("qt-test-server"); } static QString serverDomainName() { @@ -112,8 +110,9 @@ public: return entry->recordValue(); } #endif - return QString("it.local"); + //return QString("it.local"); //return QString("troll.no"); + return QString("qt-test-net"); } static QString serverName() { @@ -128,10 +127,12 @@ public: } static QString wildcardServerName() { - //return "qt-test-server.wildcard.dev." + serverDomainName(); - return "qttest.wildcard.dev." + serverDomainName(); + 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 +142,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 +317,6 @@ private: } #endif -/* -#ifdef QT_NETWORK_LIB - static QHostAddress serverIP() - { - return QHostInfo::fromName(serverName()).addresses().first(); - } -#endif -*/ }; #ifdef Q_OS_SYMBIAN |