summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2009-06-16 11:19:56 (GMT)
committermread <qt-info@nokia.com>2009-06-16 11:19:56 (GMT)
commita2e43777945fc77d9837e9212b87cdfa2d1254c1 (patch)
tree9c9cef58ad40bfecfd5b79f728bcdb81b7ce5d77
parent422f908b5452c39c935f92fe05652211ef2466d3 (diff)
parent9af7b50fba565b201cb938b128650f125b7f7291 (diff)
downloadQt-a2e43777945fc77d9837e9212b87cdfa2d1254c1.zip
Qt-a2e43777945fc77d9837e9212b87cdfa2d1254c1.tar.gz
Qt-a2e43777945fc77d9837e9212b87cdfa2d1254c1.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 7d79422..9e70cff 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -74,8 +74,6 @@ QCoeFepInputContext::QCoeFepInputContext(QObject *parent)
m_fepState->SetFlags(EAknEditorFlagDefault);
m_fepState->SetDefaultInputMode( EAknEditorTextInputMode );
m_fepState->SetPermittedInputModes( EAknEditorAllInputModes );
- m_fepState->SetLocalLanguage(ELangEnglish);
- m_fepState->SetDefaultLanguage(ELangEnglish);
m_fepState->SetDefaultCase( EAknEditorLowerCase );
m_fepState->SetPermittedCases( EAknEditorLowerCase|EAknEditorUpperCase );
m_fepState->SetSpecialCharacterTableResourceId( 0 );