From 48e30656a704ac540986ca4f6d40ae249c3041be Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Wed, 13 Apr 2016 12:14:52 +0200 Subject: QComboBox: Implement support for IM queries with QVariant argument MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If59c36fa1b18a0d5562047dd06758fbcdbf63bc7 Reviewed-by: Marc Mutz Reviewed-by: Jan Arve Sæther --- src/widgets/widgets/qcombobox.cpp | 8 ++++++++ src/widgets/widgets/qcombobox.h | 1 + 2 files changed, 9 insertions(+) (limited to 'src/widgets/widgets') diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 08c8117e0b..7992409265 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -3352,6 +3352,14 @@ QVariant QComboBox::inputMethodQuery(Qt::InputMethodQuery query) const return QWidget::inputMethodQuery(query); } +QVariant QComboBox::inputMethodQuery(Qt::InputMethodQuery query, const QVariant &argument) const +{ + Q_D(const QComboBox); + if (d->lineEdit) + return d->lineEdit->inputMethodQuery(query, argument); + return QWidget::inputMethodQuery(query); +} + /*! \fn void QComboBox::addItem(const QString &text, const QVariant &userData) diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index ed967e94f7..095a06fe31 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -202,6 +202,7 @@ public: bool event(QEvent *event) Q_DECL_OVERRIDE; QVariant inputMethodQuery(Qt::InputMethodQuery) const Q_DECL_OVERRIDE; + Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, const QVariant &argument) const; public Q_SLOTS: void clear(); -- cgit v1.2.3