summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-09-07 13:17:20 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-09-07 13:17:20 (GMT)
commit7f37724eff30c858dcec1a4a94422feaa6a9ab4f (patch)
tree5f087440fa4be0fbfd336ae044b6d6dcc27fc833 /tests/auto
parent49987d75cfe6180aeffeee9cc63f3c1068e48ad1 (diff)
downloadQt-7f37724eff30c858dcec1a4a94422feaa6a9ab4f.zip
Qt-7f37724eff30c858dcec1a4a94422feaa6a9ab4f.tar.gz
Qt-7f37724eff30c858dcec1a4a94422feaa6a9ab4f.tar.bz2
Minor fix to network-settings.h in Symbian OS
Reviewed-by: Aleksandar Sasha Babic
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/network-settings.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index d1c179e..a7fa20c 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -143,8 +143,8 @@ public:
}
return QHostAddress(serverIp.data());
}
-#endif
- return QHostInfo::fromName(serverName()).addresses().first();
+#endif // Q_OS_SYMBIAN
+ return QHostInfo::fromName(serverName()).addresses().first();
}
#endif
@@ -161,12 +161,11 @@ public:
}
return imapExpectedReply.data();
}
-#else
- QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " );
+#endif
+ QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " );s
expected = expected.append(QtNetworkSettings::serverName().toAscii());
expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
return expected;
-#endif
}
static QByteArray expectedReplySSL()