From: Ivailo Monev <xakepa10@laimg.moc>
Date: Mon, 23 Dec 2019 02:08:27 +0000 (+0000)
Subject: fix extra core types QVariant conversion
X-Git-Tag: 4.12.0~4591
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8d8ffbb034a7ea611a8c4a73807e73a71592befc;p=kde%2FKatie.git

fix extra core types QVariant conversion
---

diff --git a/src/core/kernel/qvariant.cpp b/src/core/kernel/qvariant.cpp
index b6f43e5b3..9a7955263 100644
--- a/src/core/kernel/qvariant.cpp
+++ b/src/core/kernel/qvariant.cpp
@@ -2779,6 +2779,12 @@ bool QVariant::canConvert(Type t) const
         case QVariant::Char:
         case QVariant::ByteArray:
         case QVariant::KeySequence:
+        case QMetaType::ULong:
+        case QMetaType::Long:
+        case QMetaType::UShort:
+        case QMetaType::UChar:
+        case QMetaType::Char:
+        case QMetaType::Short:
             return true;
         default:
             return false;
@@ -3119,14 +3125,7 @@ bool QVariant::canConvert(Type t) const
     /* Quaternion */
     }
 
-    switch (currentType) {
-        case QVariant::Int:
-            return t == QMetaType::ULong
-                   || t == QMetaType::Long
-                   || t == QMetaType::UShort
-                   || t == QMetaType::UChar
-                   || t == QMetaType::Char
-                   || t == QMetaType::Short;
+    switch (int(t)) {
         case QMetaType::Long:
         case QMetaType::Char:
         case QMetaType::UChar:
@@ -3134,7 +3133,7 @@ bool QVariant::canConvert(Type t) const
         case QMetaType::Short:
         case QMetaType::UShort: {
             // almost the same as Int case
-            switch (t) {
+            switch (currentType) {
                 case QVariant::Int: // Int included
                 case QVariant::UInt:
                 case QVariant::String: