Switched QtNetworkSetting to use 'qt-test-server' config by default.

Qt/Master uses qt-test-server config by default but our S60/master
was configure to use different server by default. The assumption is
that this caused several QtNetwork autotests to fail when testing
QtS60 branch on other configurations in QtSW premises. This because
the old test server was very likely unavailable...

1 files changed, 6 insertions, 5 deletions

diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index 9b67910384..48ba8e86c0 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -96,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()
     {
@@ -110,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()
     {
@@ -126,8 +127,8 @@ 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();
     }
     
 #ifdef QT_NETWORK_LIB