diff options
Diffstat (limited to 'src/declarative/items/qquickcanvas.cpp')
-rw-r--r-- | src/declarative/items/qquickcanvas.cpp | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/src/declarative/items/qquickcanvas.cpp b/src/declarative/items/qquickcanvas.cpp index 765f9eca8d..c699a76f06 100644 --- a/src/declarative/items/qquickcanvas.cpp +++ b/src/declarative/items/qquickcanvas.cpp @@ -805,28 +805,6 @@ void QQuickCanvasPrivate::updateInputMethodData() qApp->inputPanel()->setInputItem(inputItem); } -/*! - Queries the Input Method. -*/ -QVariant QQuickCanvas::inputMethodQuery(Qt::InputMethodQuery query) const -{ - Q_D(const QQuickCanvas); - if (!d->activeFocusItem || !(QQuickItemPrivate::get(d->activeFocusItem)->flags & QQuickItem::ItemAcceptsInputMethod)) - return QVariant(); - QVariant value = d->activeFocusItem->inputMethodQuery(query); - - //map geometry types - QVariant::Type type = value.type(); - if (type == QVariant::RectF || type == QVariant::Rect) { - const QTransform transform = QQuickItemPrivate::get(d->activeFocusItem)->itemToCanvasTransform(); - value = transform.mapRect(value.toRectF()); - } else if (type == QVariant::PointF || type == QVariant::Point) { - const QTransform transform = QQuickItemPrivate::get(d->activeFocusItem)->itemToCanvasTransform(); - value = transform.map(value.toPointF()); - } - return value; -} - void QQuickCanvasPrivate::dirtyItem(QQuickItem *) { Q_Q(QQuickCanvas); @@ -998,14 +976,6 @@ void QQuickCanvas::keyReleaseEvent(QKeyEvent *e) sendEvent(d->activeFocusItem, e); } -void QQuickCanvas::inputMethodEvent(QInputMethodEvent *e) -{ - Q_D(QQuickCanvas); - - if (d->activeFocusItem) - sendEvent(d->activeFocusItem, e); -} - bool QQuickCanvasPrivate::deliverInitialMousePressEvent(QQuickItem *item, QMouseEvent *event) { Q_Q(QQuickCanvas); @@ -1591,14 +1561,6 @@ bool QQuickCanvas::sendEvent(QQuickItem *item, QEvent *e) QQuickItemPrivate::get(item)->deliverKeyEvent(static_cast<QKeyEvent *>(e)); } break; - case QEvent::InputMethod: - e->accept(); - QQuickItemPrivate::get(item)->deliverInputMethodEvent(static_cast<QInputMethodEvent *>(e)); - while (!e->isAccepted() && (item = item->parentItem())) { - e->accept(); - QQuickItemPrivate::get(item)->deliverInputMethodEvent(static_cast<QInputMethodEvent *>(e)); - } - break; case QEvent::FocusIn: case QEvent::FocusOut: QQuickItemPrivate::get(item)->deliverFocusEvent(static_cast<QFocusEvent *>(e)); |