diff options
| author | axis <qt-info@nokia.com> | 2009-09-29 10:53:32 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-09-30 13:27:14 (GMT) |
| commit | a93d0d1f970689991dd113d696e922854ff9ec6a (patch) | |
| tree | 7ca564e5e68ac52572ac3ec0bb7f6b1b27b95f12 /src/corelib/kernel | |
| parent | 75666d254304746ead69892e92fa4ab39d219df1 (diff) | |
| download | Qt-a93d0d1f970689991dd113d696e922854ff9ec6a.zip Qt-a93d0d1f970689991dd113d696e922854ff9ec6a.tar.gz Qt-a93d0d1f970689991dd113d696e922854ff9ec6a.tar.bz2 | |
Revert "Switched to asynchronous focus handling on Symbian."
This reverts commit b6377f43410b14125a66ffd02acde69cfb6e455e.
The asynchronous handling caused too many headaches with input
methods, which expect the focus status to be updated immediately.
This may break the test case that was originally fixed by this patch
(I cannot find out which one at the moment), but that will have to be
solved in a different way.
Conflicts:
src/corelib/kernel/qcoreevent.cpp
src/corelib/kernel/qcoreevent.h
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_s60.cpp
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcoreevent.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreevent.h | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index 185c305..3bef0d4 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -270,7 +270,6 @@ QT_BEGIN_NAMESPACE \omitvalue NetworkReplyUpdated \omitvalue FutureCallOut \omitvalue CocoaRequestModal - \omitvalue SymbianDeferredFocusChanged \omitvalue UpdateSoftKeys \omitvalue NativeGesture */ diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index bc96918..be25b41 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -281,9 +281,7 @@ public: RequestSoftwareInputPanel = 199, CloseSoftwareInputPanel = 200, - SymbianDeferredFocusChanged = 201, // Internal for generating asynchronous focus events on Symbian - - UpdateSoftKeys = 202, // Internal for compressing soft key updates + UpdateSoftKeys = 201, // Internal for compressing soft key updates // 512 reserved for Qt Jambi's MetaCall event // 513 reserved for Qt Jambi's DeleteOnMainThread event |