From 67f04fa060be1b75b8ea60ac6eb45d1577d1fdaf Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 15 Jun 2020 09:31:31 +0200 Subject: Deprecate QVariant::Type uses in QSqlField Add metaType()/setMetaType() methods to be used instead of the type() methods taking a QVariant::Type. Change-Id: Ieaba35b73f8061cd83288dd6b50d58322db3c7ed Reviewed-by: Maurice Kalinowski --- .../tst_qsqlrelationaltablemodel.cpp | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'tests/auto/sql/models/qsqlrelationaltablemodel') diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp index 19d8430118..4fd4f1559d 100644 --- a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp @@ -468,10 +468,10 @@ void tst_QSqlRelationalTableModel::insertRecord() QVERIFY_SQL(model, select()); QSqlRecord rec; - QSqlField f1("id", QVariant::Int); - QSqlField f2("name", QVariant::String); - QSqlField f3("title_key", QVariant::Int); - QSqlField f4("another_title_key", QVariant::Int); + QSqlField f1("id", QMetaType(QMetaType::Int)); + QSqlField f2("name", QMetaType(QMetaType::QString)); + QSqlField f3("title_key", QMetaType(QMetaType::Int)); + QSqlField f4("another_title_key", QMetaType(QMetaType::Int)); f1.setValue(7); f2.setValue("test"); @@ -518,10 +518,10 @@ void tst_QSqlRelationalTableModel::setRecord() QVERIFY_SQL(model, select()); QSqlRecord rec; - QSqlField f1("id", QVariant::Int); - QSqlField f2("name", QVariant::String); - QSqlField f3("title_key", QVariant::Int); - QSqlField f4("another_title_key", QVariant::Int); + QSqlField f1("id", QMetaType(QMetaType::Int)); + QSqlField f2("name", QMetaType(QMetaType::QString)); + QSqlField f3("title_key", QMetaType(QMetaType::Int)); + QSqlField f4("another_title_key", QMetaType(QMetaType::Int)); f1.setValue(7); f2.setValue("tester"); @@ -1417,9 +1417,9 @@ void tst_QSqlRelationalTableModel::whiteSpaceInIdentifiers() QVERIFY_SQL(model, select()); QSqlRecord rec; - QSqlField f1("id", QVariant::Int); - QSqlField f2(db.driver()->escapeIdentifier("city key", QSqlDriver::FieldName), QVariant::Int); - QSqlField f3(db.driver()->escapeIdentifier("extra field", QSqlDriver::FieldName), QVariant::Int); + QSqlField f1("id", QMetaType(QMetaType::Int)); + QSqlField f2(db.driver()->escapeIdentifier("city key", QSqlDriver::FieldName), QMetaType(QMetaType::Int)); + QSqlField f3(db.driver()->escapeIdentifier("extra field", QSqlDriver::FieldName), QMetaType(QMetaType::Int)); f1.setValue(3); f2.setValue(2); @@ -1445,9 +1445,9 @@ void tst_QSqlRelationalTableModel::whiteSpaceInIdentifiers() model.setEditStrategy(QSqlTableModel::OnManualSubmit); QSqlRecord recNew; - QSqlField f1New("id", QVariant::Int); - QSqlField f2New(db.driver()->escapeIdentifier("city key", QSqlDriver::FieldName), QVariant::Int); - QSqlField f3New(db.driver()->escapeIdentifier("extra field", QSqlDriver::FieldName), QVariant::Int); + QSqlField f1New("id", QMetaType(QMetaType::Int)); + QSqlField f2New(db.driver()->escapeIdentifier("city key", QSqlDriver::FieldName), QMetaType(QMetaType::Int)); + QSqlField f3New(db.driver()->escapeIdentifier("extra field", QSqlDriver::FieldName), QMetaType(QMetaType::Int)); f1New.setValue(4); f2New.setValue(1); -- cgit v1.2.3