summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2009-12-17 21:12:14 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2009-12-17 21:12:14 (GMT)
commitbf819a04b0c60c64912f72b613c1546d8be7dc50 (patch)
tree5e8dd0f5b3abacaeabed892f72789f1c8cb6d808 /src/gui
parentb8a4b365b1105a742369bbaa5dc00e43914089e0 (diff)
parent05d1efb5322651cbe227c9fd6ac200cfff423a91 (diff)
downloadQt-bf819a04b0c60c64912f72b613c1546d8be7dc50.zip
Qt-bf819a04b0c60c64912f72b613c1546d8be7dc50.tar.gz
Qt-bf819a04b0c60c64912f72b613c1546d8be7dc50.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: WeatherInfo now shows Oslo info upon launch instead of blank screen Fixed QCoeFepInputContext::widgetDestroyed
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index a295d66..1bf7662 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -139,8 +139,7 @@ void QCoeFepInputContext::widgetDestroyed(QWidget *w)
// Make sure that the input capabilities of whatever new widget got focused are queried.
CCoeControl *ctrl = w->effectiveWinId();
if (ctrl->IsFocused()) {
- ctrl->SetFocus(false);
- ctrl->SetFocus(true);
+ queueInputCapabilitiesChanged();
}
}