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

QSqlQueryModel: guard the definition of deprecated method

Browse Source 
... to prevent compilation errors when built with
QT_DISABLE_DEPRECATED_BEFORE >= 0x060200

This commit amends 14f9f00fdb2dc428610c08e3d9d03e38e9602166

Task-number: QTBUG-105048
Change-Id: I33c586508353ccb4c0af3f5da0cdaf9abe9f590e
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
(cherry picked from commit 7ba39fff8d9d6c8b6d7629c599dd57d14a379cec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ivan Solovev 2022-07-21 17:56:09 +02:00 committed by Qt Cherry-pick Bot
parent e215d4d987
commit ec9a8c1925
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sql/models/qsqlquerymodel.cpp
View File

@ -384,7 +384,7 @@ void QSqlQueryModel::queryChange()
// do nothing
}
#if QT_DEPRECATED_SINCE(6, 2)
/*!
\deprecated [6.2] Use the \c{setQuery(QSqlQuery &&query)} overload instead.
\overload
@ -396,6 +396,7 @@ void QSqlQueryModel::setQuery(const QSqlQuery &query)
QT_IGNORE_DEPRECATIONS(QSqlQuery copy = query;)
setQuery(std::move(copy));
}
#endif // QT_DEPRECATED_SINCE(6, 2)
/*!
Resets the model and sets the data provider to be the given \a