diff options
| author | axis <qt-info@nokia.com> | 2010-01-08 14:50:03 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-01-08 15:11:25 (GMT) |
| commit | 07b484b7c4685cfc2187be840a01e15f0fe08ff5 (patch) | |
| tree | 057d9501b23d8c653066b305951410995d9a4d86 /src/gui/kernel | |
| parent | 3b62b3384e0008ab1dba210f55b70d666924d06e (diff) | |
| download | Qt-07b484b7c4685cfc2187be840a01e15f0fe08ff5.zip Qt-07b484b7c4685cfc2187be840a01e15f0fe08ff5.tar.gz Qt-07b484b7c4685cfc2187be840a01e15f0fe08ff5.tar.bz2 | |
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
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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. |