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

Fix build without features.im

Browse Source 
invalid conversion from ‘int’ to ‘Qt::InputMethodHint’ [-fpermissive]

Change-Id: Icc67470ff6ef788b4f1b2eae46c6372b7f40c0d2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tasuku Suzuki 2021-04-13 18:46:41 +09:00
parent 94e03e506a
commit a63ceffa80
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)