summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Solovev <[email protected]>2022-07-21 17:56:09 +0200
committerIvan Solovev <[email protected]>2022-08-10 22:38:24 +0200
commit7ba39fff8d9d6c8b6d7629c599dd57d14a379cec (patch)
tree5c5a2e90a1e946a67f24c1281775f91c761d67d5
parent5b2b30a9c75c0d01d91b5957a23f7962dc095c6a (diff)
QSqlQueryModel: guard the definition of deprecated method
... to prevent compilation errors when built with QT_DISABLE_DEPRECATED_BEFORE >= 0x060200 This commit amends 14f9f00fdb2dc428610c08e3d9d03e38e9602166 Task-number: QTBUG-105048 Pick-to: 6.4 6.3 6.2 Change-Id: I33c586508353ccb4c0af3f5da0cdaf9abe9f590e Reviewed-by: Edward Welbourne <[email protected]> Reviewed-by: Giuseppe D'Angelo <[email protected]>
-rw-r--r--src/sql/models/qsqlquerymodel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sql/models/qsqlquerymodel.cpp b/src/sql/models/qsqlquerymodel.cpp
index b45b08eb476..61620f81d45 100644
--- a/src/sql/models/qsqlquerymodel.cpp
+++ b/src/sql/models/qsqlquerymodel.cpp
@@ -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