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

This changes many different CMake places to mention Qt6 instead of
Qt5.

Note that some old qt5 cmake config files in corelib are probably not
needed anymore, but I still renamed and kept them for now.

Change-Id: Ie69e81540386a5af153f76c0242e18d48211bec4

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp b/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
index 681a5d0146..cc67fc7884 100644
--- a/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
+++ b/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
@@ -130,7 +130,7 @@ public:
     QString m_value;
     void setValue(const QString &value) { m_value = value; }
     QString getValue() { return m_value; }
-    void resetValue() { m_value = QLatin1Literal("reset"); }
+    void resetValue() { m_value = QLatin1String("reset"); }
 };
 
 void tst_QMetaProperty::gadget()
@@ -140,7 +140,7 @@ void tst_QMetaProperty::gadget()
     QVERIFY(valueProp.isValid());
     {
         MyGadget g;
-        QString hello = QLatin1Literal("hello");
+        QString hello = QLatin1String("hello");
         QVERIFY(valueProp.writeOnGadget(&g, hello));
         QCOMPARE(g.m_value, QLatin1String("hello"));
         QCOMPARE(valueProp.readOnGadget(&g), QVariant(hello));
@@ -242,7 +242,7 @@ void tst_QMetaProperty::conversion()
     QCOMPARE(custom.str, QString());
     // or reset resetable
     QVERIFY(value7P.write(this, QVariant()));
-    QCOMPARE(value7, QLatin1Literal("reset"));
+    QCOMPARE(value7, QLatin1String("reset"));
 }
 
 QTEST_MAIN(tst_QMetaProperty)