summaryrefslogtreecommitdiffstats
path: root/src/sql/models/qsqlquerymodel.h
diff options
context:
space:
mode:
authorIvan Solovev <ivan.solovev@qt.io>2022-08-09 12:42:59 +0200
committerIvan Solovev <ivan.solovev@qt.io>2022-08-10 22:38:24 +0200
commit2ca30440835ef99d8b5f720866fc163a9629bed7 (patch)
tree3d44c994a1f7dec26e5b732cfc4abfc7a244c0c1 /src/sql/models/qsqlquerymodel.h
parent62859ccaa666909c2db8ac4d0a46fa0f5163153f (diff)
Make QSqlQueryModel::query() return a reference to the const QSqlQuery
Returning QSqlQuery instance by value does not make much sense, because it cannot be copied correctly. Also, its copy constructor and copy-assignment operators are deprecated from Qt 6.2. [ChangeLog][Potentially Source-Incompatible Changes][QSqlQueryModel] QSqlQueryModel::query() now returns a reference to the const QSqlQuery object associated with the model. Task-number: QTBUG-105048 Change-Id: I04a2aa377b17d770d2a9855040f8c730190484d8 Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/sql/models/qsqlquerymodel.h')
-rw-r--r--src/sql/models/qsqlquerymodel.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/sql/models/qsqlquerymodel.h b/src/sql/models/qsqlquerymodel.h
index ede97b04fbd..73308b79e84 100644
--- a/src/sql/models/qsqlquerymodel.h
+++ b/src/sql/models/qsqlquerymodel.h
@@ -46,7 +46,10 @@ public:
#endif
void setQuery(QSqlQuery &&query);
void setQuery(const QString &query, const QSqlDatabase &db = QSqlDatabase());
+#if QT_SQL_REMOVED_SINCE(6, 5)
QSqlQuery query() const;
+#endif
+ const QSqlQuery &query(QT6_DECL_NEW_OVERLOAD) const;
virtual void clear();