diff options
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index f213111ccd..9180eb45cb 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -345,6 +345,7 @@ void QQuickItemKeyFilter::keyReleased(QKeyEvent *event, bool post) if (m_next) m_next->keyReleased(event, post); } +#ifndef QT_NO_IM void QQuickItemKeyFilter::inputMethodEvent(QInputMethodEvent *event, bool post) { if (m_next) @@ -358,6 +359,7 @@ QVariant QQuickItemKeyFilter::inputMethodQuery(Qt::InputMethodQuery query) const if (m_next) return m_next->inputMethodQuery(query); return QVariant(); } +#endif // QT_NO_IM void QQuickItemKeyFilter::componentComplete() { @@ -1194,6 +1196,7 @@ void QQuickKeysAttached::setPriority(Priority order) void QQuickKeysAttached::componentComplete() { Q_D(QQuickKeysAttached); +#ifndef QT_NO_IM if (d->item) { for (int ii = 0; ii < d->targets.count(); ++ii) { QQuickItem *targetItem = d->targets.at(ii); @@ -1203,6 +1206,7 @@ void QQuickKeysAttached::componentComplete() } } } +#endif } void QQuickKeysAttached::keyPressed(QKeyEvent *event, bool post) @@ -1279,6 +1283,7 @@ void QQuickKeysAttached::keyReleased(QKeyEvent *event, bool post) if (!event->isAccepted()) QQuickItemKeyFilter::keyReleased(event, post); } +#ifndef QT_NO_IM void QQuickKeysAttached::inputMethodEvent(QInputMethodEvent *event, bool post) { Q_D(QQuickKeysAttached); @@ -1317,6 +1322,7 @@ QVariant QQuickKeysAttached::inputMethodQuery(Qt::InputMethodQuery query) const } return QQuickItemKeyFilter::inputMethodQuery(query); } +#endif // QT_NO_IM QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj) { @@ -3099,6 +3105,7 @@ void QQuickItem::keyReleaseEvent(QKeyEvent *event) event->ignore(); } +#ifndef QT_NO_IM /*! This event handler can be reimplemented in a subclass to receive input method events for an item. The event information is provided by the @@ -3108,6 +3115,7 @@ void QQuickItem::inputMethodEvent(QInputMethodEvent *event) { event->ignore(); } +#endif // QT_NO_IM /*! This event handler can be reimplemented in a subclass to receive focus-in @@ -3336,6 +3344,7 @@ void QQuickItem::windowDeactivateEvent() } } +#ifndef QT_NO_IM /*! This method is only relevant for input items. @@ -3370,6 +3379,7 @@ QVariant QQuickItem::inputMethodQuery(Qt::InputMethodQuery query) const return v; } +#endif // QT_NO_IM QQuickAnchorLine QQuickItemPrivate::left() const { @@ -4023,6 +4033,7 @@ void QQuickItemPrivate::deliverKeyEvent(QKeyEvent *e) } } +#ifndef QT_NO_IM void QQuickItemPrivate::deliverInputMethodEvent(QInputMethodEvent *e) { Q_Q(QQuickItem); @@ -4048,6 +4059,7 @@ void QQuickItemPrivate::deliverInputMethodEvent(QInputMethodEvent *e) extra->keyHandler->inputMethodEvent(e, true); } } +#endif // QT_NO_IM void QQuickItemPrivate::deliverFocusEvent(QFocusEvent *e) { @@ -4146,6 +4158,7 @@ void QQuickItem::itemChange(ItemChange change, const ItemChangeData &value) Q_UNUSED(value); } +#ifndef QT_NO_IM /*! Notify input method on updated query values if needed. \a queries indicates the changed attributes. @@ -4155,6 +4168,7 @@ void QQuickItem::updateInputMethod(Qt::InputMethodQueries queries) if (hasActiveFocus()) qApp->inputMethod()->update(queries); } +#endif // QT_NO_IM /*! \internal */ // XXX todo - do we want/need this anymore? @@ -6504,6 +6518,7 @@ bool QQuickItem::event(QEvent *ev) return QObject::event(ev); } #endif +#ifndef QT_NO_IM if (ev->type() == QEvent::InputMethodQuery) { QInputMethodQueryEvent *query = static_cast<QInputMethodQueryEvent *>(ev); Qt::InputMethodQueries queries = query->queries(); @@ -6519,7 +6534,9 @@ bool QQuickItem::event(QEvent *ev) } else if (ev->type() == QEvent::InputMethod) { inputMethodEvent(static_cast<QInputMethodEvent *>(ev)); return true; - } else if (ev->type() == QEvent::StyleAnimationUpdate) { + } else +#endif // QT_NO_IM + if (ev->type() == QEvent::StyleAnimationUpdate) { update(); return true; } |