diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-26 13:56:24 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-26 13:56:24 (GMT) |
commit | 1b54b600107e33cfbebaea3b2bd3c7f24385a1a8 (patch) | |
tree | 7fd3868ce5dbf9d89b451854317d4dc09bf4d0d1 /src/gui/inputmethod/qcoefepinputcontext_p.h | |
parent | 56ca72ca00f030390e1c164f5c60a2016479bc72 (diff) | |
parent | 9175f9e5bad0f77e5d53751a8e839c8ea7df4c23 (diff) | |
download | Qt-1b54b600107e33cfbebaea3b2bd3c7f24385a1a8.zip Qt-1b54b600107e33cfbebaea3b2bd3c7f24385a1a8.tar.gz Qt-1b54b600107e33cfbebaea3b2bd3c7f24385a1a8.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add a convenience batch file to run the patch capabilities perl script
QFileDialog layout issue on Symbian (part2)
QFileDialog layout issue on Symbian
QListWidget itemActivated does not follow S60 conventions
Remove unnecessary scope definitions from QS60Style
QS60Style: Combobox button is not drawn pressed
Made characters in a password field briefly visible while typing.
RadioButtons/Checkboxes should have theme highlight
QListView::setAlternatingRowColors is not working
Added Symbian backup & restore support for Qt.sis and fluidlauncher.sis.
Diffstat (limited to 'src/gui/inputmethod/qcoefepinputcontext_p.h')
-rw-r--r-- | src/gui/inputmethod/qcoefepinputcontext_p.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_p.h b/src/gui/inputmethod/qcoefepinputcontext_p.h index 0b84e2f..f5034fc 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_p.h +++ b/src/gui/inputmethod/qcoefepinputcontext_p.h @@ -57,6 +57,7 @@ #include "qinputcontext.h" #include <qhash.h> +#include <qtimer.h> #include <private/qcore_symbian_p.h> #include <private/qt_s60_p.h> @@ -91,6 +92,9 @@ public: TCoeInputCapabilities inputCapabilities(); +protected: + void timerEvent(QTimerEvent *timerEvent); + private: void commitCurrentString(bool triggeredBySymbian); void updateHints(bool mustUpdateInputCapabilities); @@ -98,6 +102,7 @@ private: void applyFormat(QList<QInputMethodEvent::Attribute> *attributes); void queueInputCapabilitiesChanged(); bool needsInputPanel(); + void commitTemporaryPreeditString(); private Q_SLOTS: void ensureInputCapabilitiesChanged(); @@ -148,6 +153,8 @@ private: MFepPointerEventHandlerDuringInlineEdit *m_pointerHandler; int m_longPress; int m_cursorPos; + QBasicTimer m_tempPreeditStringTimeout; + bool m_hasTempPreeditString; }; QT_END_NAMESPACE |