diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-05-03 17:03:26 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-03 18:58:24 +0000 |
| commit | 69c2a606b36858454ec0b53b5d9789cf8e524806 (patch) | |
| tree | 86a97816b5e4bf4be5937774f5b8fd2a126b8086 /src/widgets/widgets/qcombobox.cpp | |
| parent | 224db5e6eb07154ba2e974a96ee617bf7d740134 (diff) | |
| parent | 6357813207c866c99aadfd91af8fb3affe891f1d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/widgets/qcombobox.cpp')
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
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) |