From 276adc5a09914fd89d976bb90cc0cd67de9d3d6e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 20 Apr 2016 11:47:36 +0200 Subject: QtWidgets: Fix qdoc warnings related to inputMethodQuery(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mark the overloads taking an additional QVariant as \internal as (cf QTextEdit) and the overridden functions as \reimp. Amends change ab67a5b7b631709aae779c767a903b8982fa7f8e, 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 --- src/widgets/widgets/qcombobox.cpp | 2 ++ src/widgets/widgets/qlineedit.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 7992409265..51e23ca7f9 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -3352,6 +3352,8 @@ QVariant QComboBox::inputMethodQuery(Qt::InputMethodQuery query) const return QWidget::inputMethodQuery(query); } +/*!\internal +*/ QVariant QComboBox::inputMethodQuery(Qt::InputMethodQuery query, const QVariant &argument) const { Q_D(const QComboBox); diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 499710d18e..3a04343108 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -1745,12 +1745,14 @@ void QLineEdit::inputMethodEvent(QInputMethodEvent *e) #endif } +/*!\reimp +*/ QVariant QLineEdit::inputMethodQuery(Qt::InputMethodQuery property) const { return inputMethodQuery(property, QVariant()); } -/*!\reimp +/*!\internal */ QVariant QLineEdit::inputMethodQuery(Qt::InputMethodQuery property, QVariant argument) const { -- cgit v1.2.3