diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2023-02-13 20:33:27 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2023-03-06 23:14:49 +0100 |
| commit | 12909d7c3df74b88382b727cfd3e215914f291ba (patch) | |
| tree | 4f0aa24127c84285c71ce6a400525cdb260b47b2 /src/sql | |
| parent | 386dcbf6b9980e7463dd3f9277c5d3852f118014 (diff) | |
QSqlDatabase: deprecate QSqlDatabase::exec()
The note that QSqlDatabase::exec() is deprecated was added more than 12
years ago so it's time to also mark the function as such.
Change-Id: Ic5e7c31b3ff5b21e16e2640548cba1a4baaeeb1c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 7 | ||||
| -rw-r--r-- | src/sql/kernel/qsqldatabase.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index e9a2953fb9..ac6e945ca3 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -389,9 +389,6 @@ void QSqlDatabasePrivate::disable() \li registers a custom-made driver \endtable - \note QSqlDatabase::exec() is deprecated. Use QSqlQuery::exec() - instead. - \note When using transactions, you must start the transaction before you create your query. @@ -692,8 +689,9 @@ QSqlDatabase::~QSqlDatabase() lastError() is not affected. \sa QSqlQuery, lastError() + \deprecated [6.6] Use QSqlQuery::exec() instead. */ - +#if QT_DEPRECATED_SINCE(6, 6) QSqlQuery QSqlDatabase::exec(const QString & query) const { QSqlQuery r(d->driver->createResult()); @@ -703,6 +701,7 @@ QSqlQuery QSqlDatabase::exec(const QString & query) const } return r; } +#endif /*! Opens the database connection using the current connection diff --git a/src/sql/kernel/qsqldatabase.h b/src/sql/kernel/qsqldatabase.h index 789f3e0ea4..1fb1eb3966 100644 --- a/src/sql/kernel/qsqldatabase.h +++ b/src/sql/kernel/qsqldatabase.h @@ -48,7 +48,10 @@ public: QStringList tables(QSql::TableType type = QSql::Tables) const; QSqlIndex primaryIndex(const QString& tablename) const; QSqlRecord record(const QString& tablename) const; +#if QT_DEPRECATED_SINCE(6, 6) + QT_DEPRECATED_VERSION_X_6_6("QSqlQuery::exec() instead.") QSqlQuery exec(const QString& query = QString()) const; +#endif QSqlError lastError() const; bool isValid() const; |