summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorPauli Jarvinen <ext-pauli.p.jarvinen@nokia.com>2012-03-29 13:47:50 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-03-30 12:40:19 (GMT)
commit8582f7c16a2f9c3915c19df5bc31af598d1e3701 (patch)
treeebf18764d286ef78b84f9d21f0a2e5997ae4acdd /src/gui/kernel
parentac694214ca34c6bcb4c8f3fb5bb46fb178cb4a4b (diff)
downloadQt-8582f7c16a2f9c3915c19df5bc31af598d1e3701.zip
Qt-8582f7c16a2f9c3915c19df5bc31af598d1e3701.tar.gz
Qt-8582f7c16a2f9c3915c19df5bc31af598d1e3701.tar.bz2
Fix window focusing problem in Symbian
The application window didn't receive focus properly on Symbian when minimized window was maximized. This was because the code first tried to set the focus and then made the window visible. However, invisible window doesn't accept focus, so the visibility should be set first and focus only after that. Not having focus properly set caused software input pane to fail to start in the Camera application, as was reported in the error case ou1cimx1#989756. Change-Id: Id659662e7d92205321746ed5a226843382a6ac89 Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qwidget_s60.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index c1badc5..93968fbf 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -1203,8 +1203,8 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
window->setFocusSafely(false);
window->MakeVisible(false);
} else if (window && oldstate & Qt::WindowMinimized) {
- window->setFocusSafely(true);
window->MakeVisible(true);
+ window->setFocusSafely(true);
}
#ifdef Q_WS_S60