From a63ceffa809216166245a5fc530e026fff09442d Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Tue, 13 Apr 2021 18:46:41 +0900 Subject: [PATCH] Fix build without features.im MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit invalid conversion from ‘int’ to ‘Qt::InputMethodHint’ [-fpermissive] Change-Id: Icc67470ff6ef788b4f1b2eae46c6372b7f40c0d2 Reviewed-by: Volker Hilsheimer --- src/widgets/kernel/qwidget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 99a6a24aff..21ec2b2a27 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -9675,16 +9675,16 @@ QVariant QWidget::inputMethodQuery(Qt::InputMethodQuery query) const */ Qt::InputMethodHints QWidget::inputMethodHints() const { -#ifndef QT_NO_IM +#if QT_CONFIG(im) const QWidgetPrivate *priv = d_func(); while (priv->inheritsInputMethodHints) { priv = priv->q_func()->parentWidget()->d_func(); Q_ASSERT(priv); } return priv->imHints; -#else //QT_NO_IM - return 0; -#endif //QT_NO_IM +#else + return Qt::ImhNone; +#endif } void QWidget::setInputMethodHints(Qt::InputMethodHints hints)