From d1ce08936b4a6f4ce2b2e878287de76d47df0b8c Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 11 Aug 2009 09:53:49 +0300 Subject: 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... --- tests/auto/network-settings.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 9b67910..48ba8e8 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 -- cgit v0.12