Qt6 port, part 2 .. compiling with cmake

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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/common-lib/utilities.cpp b/src/common-lib/utilities.cpp
index 8a7061f1..708cb5fb 100644
--- a/src/common-lib/utilities.cpp
+++ b/src/common-lib/utilities.cpp
@@ -335,12 +335,12 @@ void recursiveMergeVariantMap(QVariantMap &into, const QVariantMap &from)
             QVariant fromValue = it.value();
             QVariant &toValue = (*into)[it.key()];
 
-            bool needsMerge = (toValue.type() == fromValue.type());
+            bool needsMerge = (toValue.metaType() == fromValue.metaType());
 
             // we're trying not to detach, so we're using v_cast to avoid copies
-            if (needsMerge && (toValue.type() == QVariant::Map))
+            if (needsMerge && (toValue.metaType() == QMetaType::fromType<QVariantMap>()))
                 recursiveMergeMap(qt6_v_cast<QVariantMap>(&toValue.data_ptr()), fromValue.toMap());
-            else if (needsMerge && (toValue.type() == QVariant::List))
+            else if (needsMerge && (toValue.metaType() == QMetaType::fromType<QVariantList>()))
                 into->insert(it.key(), toValue.toList() + fromValue.toList());
             else
                 into->insert(it.key(), fromValue);