diff --git a/src/inspector/inspectorhandler.cpp b/src/inspector/inspectorhandler.cpp
index 2a2359dbcd..7fbf13aedf 100644
--- a/src/inspector/inspectorhandler.cpp
+++ b/src/inspector/inspectorhandler.cpp
@@ -287,7 +287,7 @@ static QList<InspectorCommand> s_commands{
           Q_ASSERT(property.isValid());
 
           QVariant value = QVariant::fromValue(arguments[3]);
-          if (!value.canConvert(property.type())) {
+          if (!value.canConvert(property.typeId())) {
             obj["error"] = "Property value is invalid";
             return obj;
           }
@@ -349,7 +349,7 @@ static QList<InspectorCommand> s_commands{
           Q_ASSERT(property.isValid());
 
           QVariant value = QVariant::fromValue(arguments[4]);
-          if (!value.canConvert(property.type())) {
+          if (!value.canConvert(property.typeId())) {
             obj["error"] = "Property value is invalid";
             return obj;
           }
@@ -500,13 +500,13 @@ static QList<InspectorCommand> s_commands{
           Q_ASSERT(property.isValid());
 
           QVariant value = QVariant::fromValue(arguments[2]);
-          if (value.canConvert(property.type())) {
+          if (value.canConvert(property.typeId())) {
             property.write(settingsHolder, value);
             return obj;
           }
 
           obj["error"] = QString("Property %1 has a non-supported type: %2")
-                             .arg(arguments[1], property.type());
+                             .arg(arguments[1], property.typeName());
           return obj;
         }},
 
@@ -546,7 +546,7 @@ static QList<InspectorCommand> s_commands{
           }
 
           obj["error"] = QString("Property %1 has a non-supported type: %2")
-                             .arg(arguments[1], property.type());
+                             .arg(arguments[1], property.typeName());
           return obj;
         }},
 
diff --git a/src/localsocketcontroller.cpp b/src/localsocketcontroller.cpp
index f9f2bada32..3400a303af 100644
--- a/src/localsocketcontroller.cpp
+++ b/src/localsocketcontroller.cpp
@@ -9,6 +9,7 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
+#include <QMetaType>
 
 #include "daemon/daemonerrors.h"
 #include "errorhandler.h"
@@ -380,7 +381,7 @@ void LocalSocketController::clearTimeout(const QString& responseType) {
   // here to add such a mechanism would risk a compatibility issue.
   for (QTimer* t : m_responseTimeouts) {
     QVariant timerResponseType = t->property("responseType");
-    if (timerResponseType.type() != QVariant::String) {
+    if (timerResponseType.typeId() != QMetaType::QString) {
       continue;
     }
     if (timerResponseType.toString() != responseType) {
diff --git a/src/platforms/linux/daemon/apptracker.cpp b/src/platforms/linux/daemon/apptracker.cpp
index aecda3a68c..d253512395 100644
--- a/src/platforms/linux/daemon/apptracker.cpp
+++ b/src/platforms/linux/daemon/apptracker.cpp
@@ -8,6 +8,7 @@
 
 #include <QDBusConnection>
 #include <QDBusInterface>
+#include <QMetaType>
 #include <QScopeGuard>
 #include <QtDBus/QtDBus>
 
@@ -70,7 +71,7 @@ void AppTracker::userCreated(uint userid, const QString& xdgRuntimePath) {
       new QDBusInterface(DBUS_SYSTEMD_SERVICE, DBUS_SYSTEMD_PATH,
                          DBUS_SYSTEMD_MANAGER, connection, this);
   QVariant qv = m_systemdInterface->property("ControlGroup");
-  if (!m_cgroupMount.isEmpty() && qv.type() == QVariant::String) {
+  if (!m_cgroupMount.isEmpty() && qv.typeId() == QMetaType::QString) {
     QString userCgroupPath = m_cgroupMount + qv.toString();
     logger.debug() << "Monitoring Control Groups v2 at:" << userCgroupPath;
 
diff --git a/src/settings/setting.cpp b/src/settings/setting.cpp
index f39942902b..24a1ca48ba 100644
--- a/src/settings/setting.cpp
+++ b/src/settings/setting.cpp
@@ -4,6 +4,8 @@
 
 #include "settings/setting.h"
 
+#include <QMetaType>
+
 #include "leakdetector.h"
 #include "settingsmanager.h"
 
@@ -70,9 +72,9 @@ QString Setting::log() const {
     logLine.append(QString("%1 -> ").arg(m_key));
     QVariant value = get();
     switch (value.typeId()) {
-      case QVariant::List:
+      case QMetaType::QVariantList:
         [[fallthrough]];
-      case QVariant::StringList:
+      case QMetaType::QStringList:
         logLine.append(QString("[%1]").arg(value.toStringList().join(",")));
         break;
       default:
diff --git a/tests/unit/testmodels.cpp b/tests/unit/testmodels.cpp
index 99653655d3..25b1c47efe 100644
--- a/tests/unit/testmodels.cpp
+++ b/tests/unit/testmodels.cpp
@@ -7,6 +7,7 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QMetaType>
 
 #include "constants.h"
 #include "helper.h"
@@ -1632,9 +1633,9 @@ void TestModels::serverCountryModelFromJson() {
         QCOMPARE(m.data(index, ServerCountryModel::CodeRole), code);
 
         QFETCH(QVariant, cities);
-        Q_ASSERT(cities.typeId() == QVariant::List);
+        Q_ASSERT(cities.typeId() == QMetaType::QVariantList);
         QVariant cityData = m.data(index, ServerCountryModel::CitiesRole);
-        QCOMPARE(cityData.typeId(), QVariant::List);
+        QCOMPARE(cityData.typeId(), QMetaType::QVariantList);
         QCOMPARE(cities.toList().length(), cityData.toList().length());
         for (int i = 0; i < cities.toList().length(); i++) {
           QVERIFY(cityData.toList().at(0).canConvert<ServerCity*>());
@@ -1687,7 +1688,7 @@ void TestModels::serverCountryModelFromJson() {
 
         QFETCH(QVariant, cities);
         QVariant cityData = m.data(index, ServerCountryModel::CitiesRole);
-        QCOMPARE(cityData.typeId(), QVariant::List);
+        QCOMPARE(cityData.typeId(), QMetaType::QVariantList);
         QCOMPARE(cities.toList().length(), cityData.toList().length());
         for (int i = 0; i < cities.toList().length(); i++) {
           QVERIFY(cityData.toList().at(0).canConvert<ServerCity*>());