diff options
author | Pauli Jarvinen <ext-pauli.p.jarvinen@nokia.com> | 2012-03-29 16:47:50 +0300 |
---|---|---|
committer | Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com> | 2012-04-03 14:29:32 +0200 |
commit | 276fb04edb450eb1bf6736aa8753be6027016291 (patch) | |
tree | e29f0e54f5d9995731e399380c73b58f4f0dbb15 | |
parent | 6717de84e4300c579a0c7855e4dce0e21a0c96fa (diff) | |
download | qt4-tools-276fb04edb450eb1bf6736aa8753be6027016291.tar.gz |
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>
(cherry picked from commit 8582f7c16a2f9c3915c19df5bc31af598d1e3701)
-rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index c1badc56be..93968fbf13 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 |