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

QtWidgets: Fix qdoc warnings related to inputMethodQuery().

Browse Source 
Mark the overloads taking an additional QVariant as \internal as (cf
QTextEdit) and the overridden functions as \reimp.
Amends change ab67a5b7b6, fixes warnings:
qtbase/src/widgets/widgets/qlineedit.cpp:1755: warning: Cannot find base function for '\reimp' in inputMethodQuery() /

Change-Id: I9949bf3850ab4200ee500cbe33a44faacecc30b0
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2016-04-20 11:47:36 +02:00 committed by Friedemann Kleint
parent bafe205d6a
commit 276adc5a09
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3352,6 +3352,8 @@ QVariant QComboBox::inputMethodQuery(Qt::InputMethodQuery query) const
return QWidget::inputMethodQuery(query); return QWidget::inputMethodQuery(query);
} }
/*!\internal
*/
QVariant QComboBox::inputMethodQuery(Qt::InputMethodQuery query, const QVariant &argument) const QVariant QComboBox::inputMethodQuery(Qt::InputMethodQuery query, const QVariant &argument) const
{ {
Q_D(const QComboBox); Q_D(const QComboBox);

4
src/widgets/widgets/qlineedit.cpp
View File

@ -1745,12 +1745,14 @@ void QLineEdit::inputMethodEvent(QInputMethodEvent *e)
#endif #endif
} }
/*!\reimp
*/
QVariant QLineEdit::inputMethodQuery(Qt::InputMethodQuery property) const QVariant QLineEdit::inputMethodQuery(Qt::InputMethodQuery property) const
{ {
return inputMethodQuery(property, QVariant()); return inputMethodQuery(property, QVariant());
} }
/*!\reimp /*!\internal
*/ */
QVariant QLineEdit::inputMethodQuery(Qt::InputMethodQuery property, QVariant argument) const QVariant QLineEdit::inputMethodQuery(Qt::InputMethodQuery property, QVariant argument) const
{ {