diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-15 19:19:32 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-30 22:46:35 +0200 |
| commit | 2e69ef6af9ee0f0135d0d8fd0b9bd91140a1d756 (patch) | |
| tree | 3d25e5388c6d34b1f220e54fd608eed61d5098fd /tests/auto/sql/kernel | |
| parent | 95542b386ac7882deb83a1a0d83436c68bbb6d59 (diff) | |
Rest of QtBase tests: port away from deprecated methods
Small changes to fix builds with
QT_DISABLE_DEPRECATED_UP_TO >= 0x060500
Task-number: QTBUG-104858
Change-Id: Ia531a3cee97f13827e36b3d63f28eed879fe9a40
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/sql/kernel')
| -rw-r--r-- | tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp index 026c9becec..28e3a20f4d 100644 --- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp @@ -1489,16 +1489,8 @@ void tst_QSqlQuery::forwardOnly() QCOMPARE(q.at(), QSql::AfterLastRow); -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - QSqlQuery q2 = q; -QT_WARNING_POP - - QVERIFY(q2.isForwardOnly()); - QVERIFY_SQL(q, exec(QLatin1String("select * from %1 order by id").arg(qtest))); QVERIFY(q.isForwardOnly()); - QVERIFY(q2.isForwardOnly()); QCOMPARE(q.at(), QSql::BeforeFirstRow); QVERIFY_SQL(q, seek(3)); @@ -4025,8 +4017,6 @@ void tst_QSqlQuery::QTBUG_21884() */ void tst_QSqlQuery::QTBUG_16967() { -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED QSqlQuery q2; QFETCH(QString, dbName); { @@ -4039,7 +4029,7 @@ QT_WARNING_DISABLE_DEPRECATED QSqlDatabase db = QSqlDatabase::database(dbName); CHECK_DATABASE(db); QSqlQuery q(db); - q2 = q; + q2 = QSqlQuery(q.lastQuery(), db); q.prepare("CREATE TABLE t1 (id INTEGER PRIMARY KEY, str TEXT);"); db.close(); QCOMPARE(db.lastError().type(), QSqlError::NoError); @@ -4048,7 +4038,7 @@ QT_WARNING_DISABLE_DEPRECATED QSqlDatabase db = QSqlDatabase::database(dbName); CHECK_DATABASE(db); QSqlQuery q(db); - q2 = q; + q2 = QSqlQuery(q.lastQuery(), db); q2.prepare("CREATE TABLE t1 (id INTEGER PRIMARY KEY, str TEXT);"); q2.exec(); db.close(); @@ -4058,7 +4048,7 @@ QT_WARNING_DISABLE_DEPRECATED QSqlDatabase db = QSqlDatabase::database(dbName); CHECK_DATABASE(db); QSqlQuery q(db); - q2 = q; + q2 = QSqlQuery(q.lastQuery(), db); q.exec("INSERT INTO t1 (id, str) VALUES(1, \"test1\");"); db.close(); QCOMPARE(db.lastError().type(), QSqlError::NoError); @@ -4067,12 +4057,11 @@ QT_WARNING_DISABLE_DEPRECATED QSqlDatabase db = QSqlDatabase::database(dbName); CHECK_DATABASE(db); QSqlQuery q(db); - q2 = q; + q2 = QSqlQuery(q.lastQuery(), db); q.exec("SELECT * FROM t1;"); db.close(); QCOMPARE(db.lastError().type(), QSqlError::NoError); } -QT_WARNING_POP } /* In SQLite, when a boolean value is bound to a placeholder, it should be |