Merge remote-tracking branch 'origin/dev' into merge-dev

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
index a2551f1320..443df271a8 100644
--- a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
@@ -62,7 +62,7 @@ void QIBusSerializable::deserializeFrom(const QDBusArgument &argument)
         argument >> key;
         argument >> value;
         argument.endMapEntry();
-        attachments[key] = value.variant().value<QDBusArgument>();
+        attachments[key] = qvariant_cast<QDBusArgument>(value.variant());
     }
     argument.endMap();
 }
@@ -201,7 +201,7 @@ void QIBusAttributeList::deserializeFrom(const QDBusArgument &arg)
         arg >> var;
 
         QIBusAttribute attr;
-        var.variant().value<QDBusArgument>() >> attr;
+        qvariant_cast<QDBusArgument>(var.variant()) >> attr;
         attributes.append(std::move(attr));
     }
     arg.endArray();
@@ -268,7 +268,7 @@ void QIBusText::deserializeFrom(const QDBusArgument &argument)
     argument >> text;
     QDBusVariant variant;
     argument >> variant;
-    variant.variant().value<QDBusArgument>() >> attributes;
+    qvariant_cast<QDBusArgument>(variant.variant()) >> attributes;
 
     argument.endStructure();
 }