From b002e21d15ec8ecf6455c75055c6ca3112d5f756 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 8 Sep 2011 14:37:22 +0200 Subject: Change the QInputMethodQueryEvent to be able to query a set of properties The event now takes a Qt::InputMethodQueries bitfield. Like this the editor can set all properties in one go on the event instead of having to process many query events. Change-Id: Ifd9d7328a9fce0c21625371ec744ea2090e163be Reviewed-on: http://codereview.qt-project.org/4448 Reviewed-by: Qt Sanity Bot Reviewed-by: Lars Knoll --- src/widgets/kernel/qwidget.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/widgets/kernel/qwidget.cpp') diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 125e33f0da..76544d2524 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -8358,9 +8358,14 @@ bool QWidget::event(QEvent *event) case QEvent::InputMethodQuery: if (testAttribute(Qt::WA_InputMethodEnabled)) { QInputMethodQueryEvent *query = static_cast(event); - QVariant v = inputMethodQuery(query->query()); - - query->setValue(v); + Qt::InputMethodQueries queries = query->queries(); + for (uint i = 0; i < 32; ++i) { + Qt::InputMethodQuery q = (Qt::InputMethodQuery)(int)(queries & (1<setValue(q, v); + } + } query->accept(); break; } -- cgit v1.2.3