summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp2
-rw-r--r--tests/auto/network-settings.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index d4f8341..833e000 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -102,7 +102,7 @@ void QCoeFepInputContext::reset()
void QCoeFepInputContext::ReportAknEdStateEvent(MAknEdStateObserver::EAknEdwinStateEvent aEventType)
{
- QT_TRAP_THROWING(m_fepState->ReportAknEdStateEventL(QT_EAknCursorPositionChanged));
+ QT_TRAP_THROWING(m_fepState->ReportAknEdStateEventL(aEventType));
}
void QCoeFepInputContext::update()
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index 20d342d..702dabb 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -126,7 +126,7 @@ public:
return "qt-test-server.wildcard.dev." + serverDomainName();
//return "qttest.wildcard.dev." + serverDomainName();
}
-
+
#ifdef QT_NETWORK_LIB
static QHostAddress serverIP()
{
@@ -140,11 +140,11 @@ public:
}
return QHostAddress(serverIp.data());
}
-#endif
+#endif
return QHostInfo::fromName(serverName()).addresses().first();
}
-#endif
-
+#endif
+
static QByteArray expectedReplyIMAP()
{
#ifdef Q_OS_SYMBIAN
@@ -162,8 +162,8 @@ public:
QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " );
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");
-#endif
return expected;
+#endif
}
static QByteArray expectedReplySSL()