diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index c0ecaf4849f..6c7962088a7 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -879,7 +879,7 @@ static ConsoleItem *constructLogItemTree(const QVariant &result,
                 item->appendChild(child);
         }
 
-    } else if (result.type() == QVariant::List) {
+    } else if (result.typeId() == QVariant::List) {
         if (key.isEmpty())
             text = "List";
         else
@@ -1354,9 +1354,9 @@ void QmlEnginePrivate::scripts(int types, const QList<int> ids, bool includeSour
     if (includeSource)
         cmd.arg(INCLUDESOURCE, includeSource);
 
-    if (filter.type() == QVariant::String)
+    if (filter.typeId() == QVariant::String)
         cmd.arg(FILTER, filter.toString());
-    else if (filter.type() == QVariant::Int)
+    else if (filter.typeId() == QVariant::Int)
         cmd.arg(FILTER, filter.toInt());
     else
         QTC_CHECK(!filter.isValid());
@@ -2039,7 +2039,7 @@ StackFrame QmlEnginePrivate::extractStackFrame(const QVariant &bodyVal)
     }
 
     auto extractString = [this](const QVariant &item) {
-        return ((item.type() == QVariant::String) ? item : extractData(item).value).toString();
+        return (item.typeId() == QVariant::String ? item : extractData(item).value).toString();
     };
 
     stackFrame.function = extractString(body.value("func"));
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 5324c7a8dcb..45a3277f702 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -2517,9 +2517,9 @@ void WatchModel::showEditValue(const WatchItem *item)
         else if (format == DisplayUtf8String)
             str = QString::fromUtf8(ba.constData(), ba.size());
         else if (format == DisplayUtf16String)
-            str = QString::fromUtf16((ushort *)ba.constData(), ba.size() / 2);
+            str = QString::fromUtf16(reinterpret_cast<const char16_t *>(ba.constData()), ba.size() / 2);
         else if (format == DisplayUcs4String)
-            str = QString::fromUcs4((uint *)ba.constData(), ba.size() / 4);
+            str = QString::fromUcs4(reinterpret_cast<const char32_t *>(ba.constData()), ba.size() / 4);
         m_separatedView->prepareObject<TextEdit>(item)->setPlainText(str);
     } else if (format == DisplayPlotData) {
         // Plots