Merge remote-tracking branch 'origin/wip/qt6' into dev

 Conflicts:
	.qmake.conf

Change-Id: Ifa2fade18b10478370131f0dee875ab1a37c7772

2 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/revisions/tst_revisions.cpp b/tests/auto/revisions/tst_revisions.cpp
index 606cea33..82b32827 100644
--- a/tests/auto/revisions/tst_revisions.cpp
+++ b/tests/auto/revisions/tst_revisions.cpp
@@ -56,7 +56,7 @@ void tst_revisions::revisions_data()
     QTest::addColumn<int>("revision");
 
     // Qt 5.7: 2.0, Qt 5.8: 2.1, Qt 5.9: 2.2...
-    for (int i = 0; i <= QT_VERSION_MINOR - 7; ++i)
+    for (int i = 0; i <= 15; ++i)
         QTest::newRow(qPrintable(QString("2.%1").arg(i))) << i;
 }
 
@@ -91,7 +91,7 @@ void tst_revisions::window_data()
         QTest::newRow(qPrintable(QString("screen:2.%1").arg(i))) << i << "screen: null" << QString(":1 \"ApplicationWindow.screen\" is not available in QtQuick.Templates 2.%1").arg(i);
 
     // Qt 5.9: 2.2, Qt 5.10: 2.3...
-    for (int i = 2; i <= QT_VERSION_MINOR - 7; ++i)
+    for (int i = 2; i <= 15; ++i)
         QTest::newRow(qPrintable(QString("screen:2.%1").arg(i))) << i << "screen: null" << "";
 }
 
diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp
index bfa1ecf1..a801ecaf 100644
--- a/tests/auto/sanity/tst_sanity.cpp
+++ b/tests/auto/sanity/tst_sanity.cpp
@@ -156,7 +156,7 @@ void tst_Sanity::initTestCase()
 {
     QQmlEngine engine;
     QQmlComponent component(&engine);
-    component.setData(QString("import QtQuick.Templates 2.%1; Control { }").arg(QT_VERSION_MINOR - 7).toUtf8(), QUrl());
+    component.setData(QString("import QtQuick.Templates 2.%1; Control { }").arg(15).toUtf8(), QUrl());
 
     const QStringList qmlTypeNames = QQmlMetaType::qmlTypeNames();