fix QVariant::Float type conversion regression since 71bd691d09470882be77dfa51f150936...

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/kernel/qvariant.cpp b/src/core/kernel/qvariant.cpp
index 555245b..ac762b3 100644 (file)
--- a/src/core/kernel/qvariant.cpp
+++ b/src/core/kernel/qvariant.cpp
@@ -2755,6 +2755,7 @@ bool QVariant::canConvert(Type t) const
     } else if (t == QVariant::Bool) {
         switch (currentType) {
         case QVariant::Double:
+        case QVariant::Float:
         case QVariant::Int:
         case QVariant::UInt:
         case QVariant::LongLong:
@@ -2771,6 +2772,7 @@ bool QVariant::canConvert(Type t) const
         case QVariant::UInt:
         case QVariant::String:
         case QVariant::Double:
+        case QVariant::Float:
         case QVariant::Bool:
         case QVariant::LongLong:
         case QVariant::ULongLong:
@@ -2785,6 +2787,7 @@ bool QVariant::canConvert(Type t) const
         case QVariant::Int:
         case QVariant::String:
         case QVariant::Double:
+        case QVariant::Float:
         case QVariant::Bool:
         case QVariant::LongLong:
         case QVariant::ULongLong:
@@ -2799,6 +2802,7 @@ bool QVariant::canConvert(Type t) const
         case QVariant::Int:
         case QVariant::String:
         case QVariant::Double:
+        case QVariant::Float:
         case QVariant::Bool:
         case QVariant::UInt:
         case QVariant::ULongLong:
@@ -2813,6 +2817,7 @@ bool QVariant::canConvert(Type t) const
         case QVariant::Int:
         case QVariant::String:
         case QVariant::Double:
+        case QVariant::Float:
         case QVariant::Bool:
         case QVariant::UInt:
         case QVariant::LongLong:
@@ -2861,6 +2866,7 @@ bool QVariant::canConvert(Type t) const
         case QVariant::UInt:
         case QVariant::Bool:
         case QVariant::Double:
+        case QVariant::Float:
         case QVariant::Date:
         case QVariant::Time:
         case QVariant::DateTime:
@@ -2887,6 +2893,7 @@ bool QVariant::canConvert(Type t) const
         case QVariant::UInt:
         case QVariant::Bool:
         case QVariant::Double:
+        case QVariant::Float:
         case QVariant::LongLong:
         case QVariant::ULongLong:
             return true;
@@ -3061,6 +3068,7 @@ bool QVariant::canConvert(Type t) const
                 case QVariant::UInt:
                 case QVariant::String:
                 case QVariant::Double:
+                case QVariant::Float:
                 case QVariant::Bool:
                 case QVariant::LongLong:
                 case QVariant::ULongLong: