1 files changed, 10 insertions, 20 deletions
diff --git a/tests/auto/sql/kernel/qsql/tst_qsql.cpp b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
index 1d6b271f44..7b6e260ebf 100644
--- a/tests/auto/sql/kernel/qsql/tst_qsql.cpp
+++ b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QTest>
@@ -19,11 +19,6 @@ class tst_QSql : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_QSql();
-    virtual ~tst_QSql();
-
-
 public slots:
     void initTestCase();
     void cleanupTestCase();
@@ -41,15 +36,6 @@ private slots:
 };
 
 /****************** General Qt SQL Module tests *****************/
-
-tst_QSql::tst_QSql()
-{
-}
-
-tst_QSql::~tst_QSql()
-{
-}
-
 void tst_QSql::initTestCase()
 {
 }
@@ -80,7 +66,7 @@ void tst_QSql::basicDriverTest()
     tst_Databases dbs;
     QVERIFY(dbs.open());
 
-    foreach (const QString& dbName, dbs.dbNames) {
+    for (const QString &dbName : std::as_const(dbs.dbNames)) {
         QSqlDatabase db = QSqlDatabase::database(dbName);
         QVERIFY_SQL(db, isValid());
 
@@ -125,16 +111,20 @@ void tst_QSql::open()
         QVERIFY(dbs.open());
         if (count == -1)
             // first iteration: see how many dbs are open
-            count = (int) dbs.dbNames.count();
+            count = (int) dbs.dbNames.size();
         else
             // next iterations: make sure all are opened again
-            QCOMPARE(count, (int)dbs.dbNames.count());
+            QCOMPARE(count, (int)dbs.dbNames.size());
         dbs.close();
     }
 }
 
 void tst_QSql::openInvalid()
 {
+    int argc = 1;
+    char *argv[] = { const_cast<char*>(QTest::currentAppName()) };
+    QCoreApplication app(argc, argv, false);
+
     QSqlDatabase db;
     QVERIFY(!db.open());
 
@@ -150,7 +140,7 @@ void tst_QSql::concurrentAccess()
     tst_Databases dbs;
 
     QVERIFY(dbs.open());
-    foreach (const QString& dbName, dbs.dbNames) {
+    for (const QString &dbName : std::as_const(dbs.dbNames)) {
         QSqlDatabase db = QSqlDatabase::database(dbName);
         QVERIFY(db.isValid());
         if (tst_Databases::isMSAccess(db))
@@ -182,7 +172,7 @@ void tst_QSql::openErrorRecovery()
     QVERIFY(dbs.addDbs());
     if (dbs.dbNames.isEmpty())
         QSKIP("No database drivers installed");
-    foreach (const QString& dbName, dbs.dbNames) {
+    for (const QString &dbName : std::as_const(dbs.dbNames)) {
         QSqlDatabase db = QSqlDatabase::database(dbName, false);
         CHECK_DATABASE(db);