From 07b484b7c4685cfc2187be840a01e15f0fe08ff5 Mon Sep 17 00:00:00 2001 From: axis Date: Fri, 8 Jan 2010 15:50:03 +0100 Subject: Fixed QDesktopWidget autotest. The error would happen because Qt would attempt to do focus handling on the desktop widget which eventually resulted in an assert on the Created status of the widget. RevBy: Jani Hautakangas AutoTest: Passed --- src/gui/kernel/qapplication_s60.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 27f2644..aee4324 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -930,7 +930,7 @@ void QSymbianControl::PositionChanged() void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */) { - if (m_ignoreFocusChanged) + if (m_ignoreFocusChanged || (qwidget->windowType() & Qt::WindowType_Mask) == Qt::Desktop) return; // Popups never get focused, but still receive the FocusChanged when they are hidden. -- cgit v0.12