Merge branch 'wip/qt6' into wip/cmake

Change-Id: I50ac36b8803c296998149e98cc61e38687cdd14b

3 files changed, 60 insertions, 20 deletions

diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
index 55875359ff..174db2863e 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
@@ -34,7 +34,8 @@
 #include <QSqlDriver>
 #include <QSqlError>
 #include <QSqlQuery>
-#include <QRegExp>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
 #include <QDir>
 #include <QScopedPointer>
 #include <QVariant>
@@ -511,13 +512,13 @@ public:
         QSqlQuery q( "SELECT banner FROM v$version", db );
         q.next();
 
-        QRegExp vers( "([0-9]+)\\.[0-9\\.]+[0-9]" );
-
-        if ( vers.indexIn( q.value( 0 ).toString() ) ) {
+        QRegularExpression vers("([0-9]+)\\.[0-9\\.]+[0-9]");
+        QRegularExpressionMatch match = vers.match(q.value(0).toString());
+        if (match.hasMatch()) {
             bool ok;
-            ver = vers.cap( 1 ).toInt( &ok );
+            ver = match.captured(1).toInt(&ok);
 
-            if ( !ok )
+            if (!ok)
                 ver = -1;
         }
 
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
index f309231b10..c59250e36e 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
@@ -34,7 +34,7 @@
 #include <qsqlrecord.h>
 #include <qsqlfield.h>
 #include <qsqlindex.h>
-#include <qregexp.h>
+#include <qregularexpression.h>
 #include <qvariant.h>
 #include <qdatetime.h>
 #include <qdebug.h>
@@ -228,7 +228,7 @@ struct FieldDef {
     QString fieldName() const
     {
         QString rt = typeName;
-        rt.replace(QRegExp("\\s"), QString("_"));
+        rt.replace(QRegularExpression("\\s"), QString("_"));
         int i = rt.indexOf(QLatin1Char('('));
         if (i == -1)
             i = rt.length();
diff --git a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
index be0285537e..871ac24be4 100644
--- a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
+++ b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
@@ -42,7 +42,9 @@ public:
     virtual ~tst_QSqlError();
 
 private slots:
+#if QT_DEPRECATED_SINCE(5, 1)
     void getSetCheck();
+#endif
     void construction();
     void moveOperator();
     void operators();
@@ -57,6 +59,7 @@ tst_QSqlError::~tst_QSqlError()
 {
 }
 
+#if QT_DEPRECATED_SINCE(5, 1)
 // Testing get/set functions
 void tst_QSqlError::getSetCheck()
 {
@@ -83,14 +86,28 @@ void tst_QSqlError::getSetCheck()
     obj1.setNumber(INT_MAX);
     QCOMPARE(INT_MAX, obj1.number());
 }
+#endif
 
 void tst_QSqlError::construction()
 {
-   QSqlError obj1("drivertext", "databasetext", QSqlError::UnknownError, 123);
+#if QT_DEPRECATED_SINCE(5, 3)
+   {
+       QSqlError obj1("drivertext", "databasetext", QSqlError::UnknownError, 123);
+       QCOMPARE(obj1.driverText(), QString("drivertext"));
+       QCOMPARE(obj1.databaseText(), QString("databasetext"));
+       QCOMPARE(obj1.type(), QSqlError::UnknownError);
+       QCOMPARE(obj1.number(), 123);
+       QCOMPARE(obj1.nativeErrorCode(), QStringLiteral("123"));
+       QVERIFY(obj1.isValid());
+   }
+#endif
+   QSqlError obj1("drivertext", "databasetext", QSqlError::UnknownError, QStringLiteral("123"));
    QCOMPARE(obj1.driverText(), QString("drivertext"));
    QCOMPARE(obj1.databaseText(), QString("databasetext"));
    QCOMPARE(obj1.type(), QSqlError::UnknownError);
+#if QT_DEPRECATED_SINCE(5, 3)
    QCOMPARE(obj1.number(), 123);
+#endif
    QCOMPARE(obj1.nativeErrorCode(), QStringLiteral("123"));
    QVERIFY(obj1.isValid());
 
@@ -98,7 +115,9 @@ void tst_QSqlError::construction()
    QCOMPARE(obj2.driverText(), obj1.driverText());
    QCOMPARE(obj2.databaseText(), obj1.databaseText());
    QCOMPARE(obj2.type(), obj1.type());
+#if QT_DEPRECATED_SINCE(5, 3)
    QCOMPARE(obj2.number(), obj1.number());
+#endif
    QCOMPARE(obj2.nativeErrorCode(), obj1.nativeErrorCode());
    QVERIFY(obj2.isValid());
 
@@ -106,7 +125,9 @@ void tst_QSqlError::construction()
    QCOMPARE(obj3.driverText(), obj2.driverText());
    QCOMPARE(obj3.databaseText(), obj2.databaseText());
    QCOMPARE(obj3.type(), obj2.type());
+#if QT_DEPRECATED_SINCE(5, 3)
    QCOMPARE(obj3.number(), obj2.number());
+#endif
    QCOMPARE(obj3.nativeErrorCode(), obj2.nativeErrorCode());
    QVERIFY(obj3.isValid());
 
@@ -116,7 +137,9 @@ void tst_QSqlError::construction()
    QCOMPARE(obj4.databaseText(), QString());
    QCOMPARE(obj4.text(), QString());
    QCOMPARE(obj4.type(), QSqlError::NoError);
+#if QT_DEPRECATED_SINCE(5, 3)
    QCOMPARE(obj4.number(), -1);
+#endif
    QCOMPARE(obj4.nativeErrorCode(), QString());
 
    QSqlError obj5(QStringLiteral("drivertext"), QStringLiteral("databasetext"),
@@ -124,7 +147,9 @@ void tst_QSqlError::construction()
    QCOMPARE(obj5.driverText(), QString("drivertext"));
    QCOMPARE(obj5.databaseText(), QString("databasetext"));
    QCOMPARE(obj5.type(), QSqlError::UnknownError);
+#if QT_DEPRECATED_SINCE(5, 3)
    QCOMPARE(obj5.number(), 123);
+#endif
    QCOMPARE(obj5.nativeErrorCode(), QStringLiteral("123"));
    QVERIFY(obj5.isValid());
 
@@ -133,17 +158,31 @@ void tst_QSqlError::construction()
    QCOMPARE(obj6.driverText(), QString("drivertext"));
    QCOMPARE(obj6.databaseText(), QString("databasetext"));
    QCOMPARE(obj6.type(), QSqlError::UnknownError);
+#if QT_DEPRECATED_SINCE(5, 3)
    QCOMPARE(obj6.number(), 0);
+#endif
    QCOMPARE(obj6.nativeErrorCode(), QStringLiteral("Err123"));
    QVERIFY(obj6.isValid());
 
-   // Default constructed object as constructed before Qt 5.3
-   QSqlError obj7(QString(), QString(), QSqlError::NoError, -1);
+#if QT_DEPRECATED_SINCE(5, 3)
+   {
+        // Default constructed object as constructed before Qt 5.3
+       QSqlError obj7(QString(), QString(), QSqlError::NoError, -1);
+       QVERIFY(!obj7.isValid());
+       QCOMPARE(obj7.driverText(), QString());
+       QCOMPARE(obj7.databaseText(), QString());
+       QCOMPARE(obj7.type(), QSqlError::NoError);
+       QCOMPARE(obj7.number(), -1);
+       QCOMPARE(obj7.nativeErrorCode(), QString());
+   }
+#endif
+
+   // Default constructed object
+   QSqlError obj7;
    QVERIFY(!obj7.isValid());
    QCOMPARE(obj7.driverText(), QString());
    QCOMPARE(obj7.databaseText(), QString());
    QCOMPARE(obj7.type(), QSqlError::NoError);
-   QCOMPARE(obj7.number(), -1);
    QCOMPARE(obj7.nativeErrorCode(), QString());
 
    // Move constructor
@@ -151,32 +190,32 @@ void tst_QSqlError::construction()
    QCOMPARE(obj8.driverText(), obj2.driverText());
    QCOMPARE(obj8.databaseText(), obj2.databaseText());
    QCOMPARE(obj8.type(), obj2.type());
+#if QT_DEPRECATED_SINCE(5, 3)
    QCOMPARE(obj8.number(), obj2.number());
+#endif
    QCOMPARE(obj8.nativeErrorCode(), obj2.nativeErrorCode());
    QVERIFY(obj8.isValid());
 }
 
 void tst_QSqlError::moveOperator()
 {
-   QSqlError obj1("drivertext", "databasetext", QSqlError::UnknownError, 123), obj2;
+   QSqlError obj1("drivertext", "databasetext", QSqlError::UnknownError, QStringLiteral("123")), obj2;
    obj2 = std::move(obj1);
    QCOMPARE(obj2.driverText(), QString("drivertext"));
    QCOMPARE(obj2.databaseText(), QString("databasetext"));
    QCOMPARE(obj2.type(), QSqlError::UnknownError);
+#if QT_DEPRECATED_SINCE(5, 3)
    QCOMPARE(obj2.number(), 123);
+#endif
    QCOMPARE(obj2.nativeErrorCode(), QStringLiteral("123"));
    QVERIFY(obj2.isValid());
 }
 
 void tst_QSqlError::operators()
 {
-   QSqlError error1;
-   QSqlError error2;
-   QSqlError error3;
-
-   error1.setType(QSqlError::NoError);
-   error2.setType(QSqlError::NoError);
-   error3.setType(QSqlError::UnknownError);
+   QSqlError error1(QString(), QString(), QSqlError::NoError);
+   QSqlError error2(QString(), QString(), QSqlError::NoError);
+   QSqlError error3(QString(), QString(), QSqlError::UnknownError);
 
    QCOMPARE(error1, error2);
    QVERIFY(error1 != error3);