1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1618376490

Browse Source
This commit is contained in:
Qt CI Bot 2021-04-14 07:24:31 +00:00
commit 62efc8990d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/kernel/qwidget.cpp
View File

@ -9675,16 +9675,16 @@ QVariant QWidget::inputMethodQuery(Qt::InputMethodQuery query) const
*/ */
Qt::InputMethodHints QWidget::inputMethodHints() const Qt::InputMethodHints QWidget::inputMethodHints() const
{ {
#ifndef QT_NO_IM #if QT_CONFIG(im)
const QWidgetPrivate *priv = d_func(); const QWidgetPrivate *priv = d_func();
while (priv->inheritsInputMethodHints) { while (priv->inheritsInputMethodHints) {
priv = priv->q_func()->parentWidget()->d_func(); priv = priv->q_func()->parentWidget()->d_func();
Q_ASSERT(priv); Q_ASSERT(priv);
} }
return priv->imHints; return priv->imHints;
#else //QT_NO_IM #else
return 0; return Qt::ImhNone;
#endif //QT_NO_IM #endif
} }
void QWidget::setInputMethodHints(Qt::InputMethodHints hints) void QWidget::setInputMethodHints(Qt::InputMethodHints hints)