diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-14 08:55:59 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-14 08:55:59 (GMT) |
| commit | f960159259d975f20bad6abe154ea71695537f42 (patch) | |
| tree | 38f128338f660eff0c2899b5815095689c7832bc | |
| parent | 9042d6bbcda61f2234f17704a14389e3f399b131 (diff) | |
| parent | a790e258d2ecd8e217d79d201f7e646bd13b1ce0 (diff) | |
| download | Qt-f960159259d975f20bad6abe154ea71695537f42.zip Qt-f960159259d975f20bad6abe154ea71695537f42.tar.gz Qt-f960159259d975f20bad6abe154ea71695537f42.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
| -rw-r--r-- | src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/network-settings.h | 10 |
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() |