From 7f37724eff30c858dcec1a4a94422feaa6a9ab4f Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Mon, 7 Sep 2009 16:17:20 +0300 Subject: Minor fix to network-settings.h in Symbian OS Reviewed-by: Aleksandar Sasha Babic --- tests/auto/network-settings.h | 9 ++++----- 1 file 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() -- cgit v0.12