Qt6 port without cmake support

All deprecation warnings fixed and all autotest pass.

Change-Id: I05d48e9ddd2bf23b900065726d67710eea0e82d0
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

4 files changed, 19 insertions, 22 deletions

diff --git a/tests/auto/core/qiviabstractfeature/tst_qiviabstractfeature.cpp b/tests/auto/core/qiviabstractfeature/tst_qiviabstractfeature.cpp
index be3c75b..fc1b603 100644
--- a/tests/auto/core/qiviabstractfeature/tst_qiviabstractfeature.cpp
+++ b/tests/auto/core/qiviabstractfeature/tst_qiviabstractfeature.cpp
@@ -576,13 +576,11 @@ public:
 };
 
 QT_BEGIN_NAMESPACE
-QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS
 QT_END_NAMESPACE
 int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
     app.setAttribute(Qt::AA_Use96Dpi, true);
-    QTEST_ADD_GPU_BLACKLIST_SUPPORT
     tst_QIviAbstractFeature f;
     tst_QIviAbstractFeatureListModel lM;
     QTEST_SET_MAIN_SOURCE_PATH
diff --git a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
index 17c6ea6..093cbfd 100644
--- a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
+++ b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
@@ -38,12 +38,13 @@
 #include <QQmlComponent>
 #include <QScopedPointer>
 
+QT_BEGIN_NAMESPACE
 
 bool operator<=(const QVariant &left, const QVariant &right)
 {
-    if (left.canConvert(QVariant::Double) && right.canConvert(QVariant::Double))
+    if (left.canConvert(QMetaType::fromType<double>()) && right.canConvert(QMetaType::fromType<double>()))
         return left.toDouble() <= right.toDouble();
-    else if (left.canConvert(QVariant::String) && right.canConvert(QVariant::String))
+    else if (left.canConvert(QMetaType::fromType<QString>()) && right.canConvert(QMetaType::fromType<QString>()))
         return left.toString() <= right.toString();
 
     qCritical() << "Can't compare these types:" << left << right;
@@ -52,9 +53,9 @@ bool operator<=(const QVariant &left, const QVariant &right)
 
 bool operator>=(const QVariant &left, const QVariant &right)
 {
-    if (left.canConvert(QVariant::Double) && right.canConvert(QVariant::Double))
+    if (left.canConvert(QMetaType::fromType<double>()) && right.canConvert(QMetaType::fromType<double>()))
         return left.toDouble() >= right.toDouble();
-    else if (left.canConvert(QVariant::String) && right.canConvert(QVariant::String))
+    else if (left.canConvert(QMetaType::fromType<QString>()) && right.canConvert(QMetaType::fromType<QString>()))
         return left.toString() >= right.toString();
 
     qCritical() << "Can't compare these types:" << left << right;
@@ -71,6 +72,8 @@ bool operator>(const QVariant &left, const QVariant &right)
     return !(left <= right);
 }
 
+QT_END_NAMESPACE
+
 class TestBackend : public QIviSearchAndBrowseModelInterface
 {
     Q_OBJECT
@@ -199,8 +202,8 @@ public:
             QList<QIviStandardItem> resultList;
             for (const QIviStandardItem &item : qAsConst(list)) {
                 QVariant value = mp.readOnGadget(&item);
-                if (value.canConvert(filterTerm->value().userType()))
-                    value.convert(filterTerm->value().userType());
+                if (value.canConvert(filterTerm->value().metaType()))
+                    value.convert(filterTerm->value().metaType());
 
                 bool filterCondition = (filterTerm->operatorType() == QIviFilterTerm::Equals && value == filterTerm->value()) ||
                                        (filterTerm->operatorType() == QIviFilterTerm::GreaterThan && value > filterTerm->value()) ||
@@ -233,9 +236,9 @@ public:
             std::sort(list.begin(), list.end(), [mp, this](const QIviStandardItem &s1, const QIviStandardItem &s2) {
                 QVariant var1 = mp.readOnGadget(&s1);
                 QVariant var2 = mp.readOnGadget(&s2);
-                if (var1.canConvert(QMetaType::Int) && var1.canConvert(QMetaType::Int)) {
-                    var1.convert(QMetaType::Int);
-                    var2.convert(QMetaType::Int);
+                if (var1.canConvert(QMetaType::fromType<int>()) && var1.canConvert(QMetaType::fromType<int>())) {
+                    var1.convert(QMetaType::fromType<int>());
+                    var2.convert(QMetaType::fromType<int>());
                 }
 
                 bool lower = var1 > var2;
diff --git a/tests/auto/core/qivisimulationengine/tst_qivisimulationengine.cpp b/tests/auto/core/qivisimulationengine/tst_qivisimulationengine.cpp
index 4edffc4..56fd2e2 100644
--- a/tests/auto/core/qivisimulationengine/tst_qivisimulationengine.cpp
+++ b/tests/auto/core/qivisimulationengine/tst_qivisimulationengine.cpp
@@ -218,7 +218,7 @@ QVariant callTestFunction(QObject* object, const QByteArray &function, QVariantL
     QVariant retValue;
     QGenericReturnArgument retArgument;
     if (returnValue.isValid()) {
-        retValue = QVariant(returnValue.type());
+        retValue = QVariant(returnValue.metaType());
         retArgument = QGenericReturnArgument(retValue.typeName(), retValue.data());
     }
 
diff --git a/tests/auto/core/qivisimulationglobalobject/tst_qivisimulationglobalobject.cpp b/tests/auto/core/qivisimulationglobalobject/tst_qivisimulationglobalobject.cpp
index 546520a..5171a7b 100644
--- a/tests/auto/core/qivisimulationglobalobject/tst_qivisimulationglobalobject.cpp
+++ b/tests/auto/core/qivisimulationglobalobject/tst_qivisimulationglobalobject.cpp
@@ -68,10 +68,6 @@ public:
         : m_intProperty(intProperty)
         , m_boolProperty(boolProperty)
     {
-        static bool once = false;
-        if (!once)
-            QMetaType::registerEqualsComparator<TestStruct>();
-        once = true;
     }
 
     int intProperty() const { return m_intProperty; }
@@ -87,18 +83,18 @@ protected:
         QVariant value = qtivi_convertFromJSON(variant);
         // First try to convert the values to a Map or a List
         // This is needed as it could also store a QStringList or a Hash
-        if (value.canConvert(QVariant::Map))
-            value.convert(QVariant::Map);
-        if (value.canConvert(QVariant::List))
-            value.convert(QVariant::List);
+        if (value.canConvert(QMetaType::fromType<QVariantMap>()))
+            value.convert(QMetaType::fromType<QVariantMap>());
+        if (value.canConvert(QMetaType::fromType<QVariantList>()))
+            value.convert(QMetaType::fromType<QVariantList>());
 
-        if (value.type() == QVariant::Map) {
+        if (value.metaType() == QMetaType::fromType<QVariantMap>()) {
             QVariantMap map = value.toMap();
             if (map.contains(QStringLiteral("intProperty")))
                 m_intProperty = map.value(QStringLiteral("intProperty")).value<int>();
             if (map.contains(QStringLiteral("boolProperty")))
                 m_boolProperty = map.value(QStringLiteral("boolProperty")).value<bool>();
-        } else if (value.type() == QVariant::List) {
+        } else if (value.metaType() == QMetaType::fromType<QVariantList>()) {
             QVariantList values = value.toList();
             m_intProperty = values.value(0).value<int>();
             m_boolProperty = values.value(1).value<bool>();