diff options
author | Sami Merila <sami.merila@nokia.com> | 2011-08-18 06:24:13 (GMT) |
---|---|---|
committer | Sami Merila <sami.merila@nokia.com> | 2011-08-18 06:24:13 (GMT) |
commit | 95df5be87b37da139dba33b06aaf6e2a251be698 (patch) | |
tree | bda9ddb6ea0f57b88446d18a4c493e13d61a1590 /src/gui | |
parent | a2709ef3f4410a1d1755e00353e6f969f8bb5613 (diff) | |
download | Qt-95df5be87b37da139dba33b06aaf6e2a251be698.zip Qt-95df5be87b37da139dba33b06aaf6e2a251be698.tar.gz Qt-95df5be87b37da139dba33b06aaf6e2a251be698.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
Diffstat (limited to 'src/gui')
-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; } |