TableModel: Allow a double to be added to a field seen as int previously

Since the type for a TableModelColumn can be seen as an int when it is
in the first row, it is still possible that it is representing a double
value in other rows. Therefore it should be allowed to add/change a row
that would display a double for that column.

Change-Id: I994a8ead595f836a20a4e82fbf94953b1aa4b7da
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 17 insertions, 4 deletions

diff --git a/src/qmlmodels/qqmltablemodel.cpp b/src/qmlmodels/qqmltablemodel.cpp
index f190ad86b1..fab20f7410 100644
--- a/src/qmlmodels/qqmltablemodel.cpp
+++ b/src/qmlmodels/qqmltablemodel.cpp
@@ -1028,11 +1028,24 @@ bool QQmlTableModel::validateNewRow(const char *functionName, const QVariant &ro
             }
 
             const QVariant rolePropertyValue = rowAsMap.value(roleData.name);
+
             if (rolePropertyValue.type() != roleData.type) {
-                qmlWarning(this).quote() << functionName << ": expected the property named "
-                    << roleData.name << " to be of type " << roleData.typeName
-                    << ", but got " << QString::fromLatin1(rolePropertyValue.typeName()) << " instead";
-                return false;
+                if (!rolePropertyValue.canConvert(int(roleData.type))) {
+                    qmlWarning(this).quote() << functionName << ": expected the property named "
+                        << roleData.name << " to be of type " << roleData.typeName
+                        << ", but got " << QString::fromLatin1(rolePropertyValue.typeName())
+                        << " instead";
+                    return false;
+                }
+
+                QVariant effectiveValue = rolePropertyValue;
+                if (!effectiveValue.convert(int(roleData.type))) {
+                    qmlWarning(this).nospace() << functionName << ": failed converting value "
+                        << rolePropertyValue << " set at column " << columnIndex << " with role "
+                        << QString::fromLatin1(rolePropertyValue.typeName()) << " to "
+                        << roleData.typeName;
+                    return false;
+                }
             }
         }
     }