Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Regression caused by 2be143e

Author: Qt Continuous Integration System

src/gui/inputmethod/qcoefepinputcontext_s60.cpp

@@ -164,7 +164,7 @@ void QCoeFepInputContext::reset()
     // text.
     if (m_cachedPreeditString.isEmpty() && !(currentHints & Qt::ImhNoPredictiveText)) {
         m_cachedPreeditString = m_preeditString;
-        if (focusWidget()) {
+        if (focusWidget() && !m_cachedPreeditString.isEmpty()) {
             int cursor = focusWidget()->inputMethodQuery(Qt::ImCursorPosition).toInt();
             int anchor = focusWidget()->inputMethodQuery(Qt::ImAnchorPosition).toInt();
             if (cursor == anchor)