diff options
| author | Sami Merila <sami.merila@nokia.com> | 2011-08-18 06:24:13 (GMT) |
|---|---|---|
| committer | Timo Turunen <timo.p.turunen@nokia.com> | 2011-08-30 07:02:16 (GMT) |
| commit | 23c5cfdb1b7d3549dd114065669894ac254b5d66 (patch) | |
| tree | 41a0c3841558d30a842914b769ddce5fe7b0b193 | |
| parent | 829f6e1cfedbfc3cb6826e331af7ad7c853351b8 (diff) | |
| download | Qt-23c5cfdb1b7d3549dd114065669894ac254b5d66.zip Qt-23c5cfdb1b7d3549dd114065669894ac254b5d66.tar.gz Qt-23c5cfdb1b7d3549dd114065669894ac254b5d66.tar.bz2 | |
Compile fix for Symbian 5th and earlier
Additional fix to enable compilation of Qt GUI
to succeed on earlier Symbian SDKs.
Task-number: QTBUG-20033
Reviewed-by: Kalle Lehtonen
(cherry picked from commit 95df5be87b37da139dba33b06aaf6e2a251be698)
Reapplied after bad v4.7.4 merge
| -rw-r--r-- | src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index e22e27c..d545f2e 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -64,6 +64,8 @@ #define QT_EAknCursorPositionChanged MAknEdStateObserver::EAknEdwinStateEvent(6) // MAknEdStateObserver::EAknActivatePenInputRequest #define QT_EAknActivatePenInputRequest MAknEdStateObserver::EAknEdwinStateEvent(7) +// MAknEdStateObserver::EAknClosePenInputRequest +#define QT_EAknClosePenInputRequest MAknEdStateObserver::EAknEdwinStateEvent(10) // EAknEditorFlagSelectionVisible is only valid from 3.2 onwards. // Sym^3 AVKON FEP manager expects that this flag is used for FEP-aware editors @@ -315,8 +317,9 @@ bool QCoeFepInputContext::filterEvent(const QEvent *event) if (!needsInputPanel()) return false; - if (event->type() == QEvent::CloseSoftwareInputPanel) { - m_fepState->ReportAknEdStateEventL(MAknEdStateObserver::EAknClosePenInputRequest); + if ((event->type() == QEvent::CloseSoftwareInputPanel) + && (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0)) { + m_fepState->ReportAknEdStateEventL(QT_EAknClosePenInputRequest); return false; } |