AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QComboBox: Implement support for IM queries with QVariant argument

Browse Source 
Change-Id: If59c36fa1b18a0d5562047dd06758fbcdbf63bc7
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
This commit is contained in:
Richard Moe Gustavsen 2016-04-13 12:14:52 +02:00
parent f942d82d14
commit 48e30656a7
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/widgets/qcombobox.cpp
View File

@ -3352,6 +3352,14 @@ QVariant QComboBox::inputMethodQuery(Qt::InputMethodQuery query) const
return QWidget::inputMethodQuery(query); 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) \fn void QComboBox::addItem(const QString &text, const QVariant &userData)

1
src/widgets/widgets/qcombobox.h
View File

@ -202,6 +202,7 @@ public:
bool event(QEvent *event) Q_DECL_OVERRIDE; bool event(QEvent *event) Q_DECL_OVERRIDE;
QVariant inputMethodQuery(Qt::InputMethodQuery) const 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: public Q_SLOTS:
void clear(); void clear();