summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorFabian Bumberger <fbumberger@rim.com>2014-04-04 18:06:50 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-05 02:27:31 +0200
commit8d83562c1f4e37875d00761219968431e18a7704 (patch)
tree3cf8ba643f7b0604edb008e352d4e87a9fe41fe9 /src/gui/kernel
parent1a6d7b6e93455064229edd6e64f6fac65c22cb61 (diff)
QNX: Surpress manual window activation during showFullScreen
When a window is shown, libscreen will give it keyboard focus. Requesting the activation right after the window is created (and before libscreen activated the window) causes problems on some devices e.g. Q10. Change-Id: I29f7a38990ea4259a8b0c6624f70e31d7291af00 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qwindow.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 13da58e391..6dcc3df166 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -1751,7 +1751,10 @@ void QWindow::showFullScreen()
{
setWindowState(Qt::WindowFullScreen);
setVisible(true);
+#if !defined Q_OS_QNX // On QNX this window will be activated anyway from libscreen
+ // activating it here before libscreen activates it causes problems
requestActivate();
+#endif
}
/*!