summaryrefslogtreecommitdiffstats
path: root/tests/arthur
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2010-09-08 11:33:14 (GMT)
committeraavit <qt-info@nokia.com>2010-09-08 11:33:14 (GMT)
commitf95b6a469907294bcf1a1f6bd6271cef19939bd1 (patch)
treec566cd0dcd630e806e565b3a4c498aecfb5896ae /tests/arthur
parent6d4003b0fd742ee2be2e536091d5b65d72d01ce0 (diff)
parent45d5811cb2b47e41d7bb0be4cd44e5aef739f804 (diff)
downloadQt-f95b6a469907294bcf1a1f6bd6271cef19939bd1.zip
Qt-f95b6a469907294bcf1a1f6bd6271cef19939bd1.tar.gz
Qt-f95b6a469907294bcf1a1f6bd6271cef19939bd1.tar.bz2
Merge branch 'lancelot' of scm.dev.nokia.troll.no:qt/aavits-graphicsstuff into lancelot
Diffstat (limited to 'tests/arthur')
-rw-r--r--tests/arthur/common/baselineprotocol.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/arthur/common/baselineprotocol.cpp b/tests/arthur/common/baselineprotocol.cpp
index 7996fff..34d1a04 100644
--- a/tests/arthur/common/baselineprotocol.cpp
+++ b/tests/arthur/common/baselineprotocol.cpp
@@ -141,7 +141,9 @@ bool BaselineProtocol::connect()
{
errMsg.clear();
//###TBD: determine server address; for now local devhost
- QLatin1String serverName("chimera.europe.nokia.com");
+ QByteArray serverName(qgetenv("QT_LANCELOT_SERVER"));
+ if (serverName.isNull())
+ serverName = "chimera.europe.nokia.com";
socket.connectToHost(serverName, ServerPort);