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

Rest of QtBase tests: port away from deprecated methods

Browse Source 
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>
This commit is contained in:
Ivan Solovev 2022-08-15 19:19:32 +02:00
parent 95542b386a
commit 2e69ef6af9
4 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/corelib/serialization/json/tst_qtjson.cpp
View File

@ -1669,7 +1669,8 @@ void tst_QtJson::fromVariantHash()
void tst_QtJson::toVariantMap()
{
QCOMPARE(QMetaType::Type(QJsonValue(QJsonObject()).toVariant().type()), QMetaType::QVariantMap); // QTBUG-32524
QCOMPARE(QMetaType::Type(QJsonValue(QJsonObject()).toVariant().typeId()),
QMetaType::QVariantMap); // QTBUG-32524
QJsonObject object;
QVariantMap map = object.toVariantMap();
@ -1689,7 +1690,7 @@ void tst_QtJson::toVariantMap()
QCOMPARE(map.size(), 3);
QCOMPARE(map.value("Key"), QVariant(QString("Value")));
QCOMPARE(map.value("null"), QVariant::fromValue(nullptr));
QCOMPARE(map.value("Array").type(), QVariant::List);
QCOMPARE(map.value("Array").typeId(), QMetaType::QVariantList);
QVariantList list = map.value("Array").toList();
QCOMPARE(list.size(), 4);
QCOMPARE(list.at(0), QVariant(true));
@ -1718,7 +1719,7 @@ void tst_QtJson::toVariantHash()
QCOMPARE(hash.size(), 3);
QCOMPARE(hash.value("Key"), QVariant(QString("Value")));
QCOMPARE(hash.value("null"), QVariant::fromValue(nullptr));
QCOMPARE(hash.value("Array").type(), QVariant::List);
QCOMPARE(hash.value("Array").typeId(), QMetaType::QVariantList);
QVariantList list = hash.value("Array").toList();
QCOMPARE(list.size(), 4);
QCOMPARE(list.at(0), QVariant(true));
@ -1729,7 +1730,8 @@ void tst_QtJson::toVariantHash()
void tst_QtJson::toVariantList()
{
QCOMPARE(QMetaType::Type(QJsonValue(QJsonArray()).toVariant().type()), QMetaType::QVariantList); // QTBUG-32524
QCOMPARE(QMetaType::Type(QJsonValue(QJsonArray()).toVariant().typeId()),
QMetaType::QVariantList); // QTBUG-32524
QJsonArray array;
QVariantList list = array.toVariantList();
@ -1749,7 +1751,7 @@ void tst_QtJson::toVariantList()
QCOMPARE(list.size(), 3);
QCOMPARE(list[0], QVariant(QString("Value")));
QCOMPARE(list[1], QVariant::fromValue(nullptr));
QCOMPARE(list[2].type(), QVariant::List);
QCOMPARE(list[2].typeId(), QMetaType::QVariantList);
QVariantList vlist = list[2].toList();
QCOMPARE(vlist.size(), 4);
QCOMPARE(vlist.at(0), QVariant(true));

5
tests/auto/gui/kernel/qevent/tst_qevent.cpp
View File

@ -42,10 +42,7 @@
X(QIconDragEvent, ()) \
X(QShowEvent, ()) \
X(QHideEvent, ()) \
QT_WARNING_PUSH \
QT_WARNING_DISABLE_DEPRECATED \
X(QContextMenuEvent, (QContextMenuEvent::Reason::Keyboard, {})) \
QT_WARNING_POP \
X(QContextMenuEvent, (QContextMenuEvent::Reason::Keyboard, {}, {})) \
X(QInputMethodEvent, ()) \
X(QInputMethodQueryEvent, ({})) \
X(QDropEvent, ({}, {}, {}, {}, {})) \

2
tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
View File

@ -343,9 +343,11 @@ void tst_QTouchEvent::state()
QVERIFY(!touchEvent3.isBeginEvent());
QVERIFY(!touchEvent3.isUpdateEvent());
QVERIFY(touchEvent3.isEndEvent());
#if QT_DEPRECATED_SINCE(6, 0)
QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED // test Qt 5 compatibility wrappers
QCOMPARE(touchEvent3.touchPoints(), touchEvent3.points());
QT_WARNING_POP
#endif
}
void tst_QTouchEvent::touchDisabledByDefault()

19
tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
View File

@ -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