diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-21 13:27:46 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-23 07:46:35 +0000 |
| commit | a9276971aa8018837b23a847b5dee3b63b39232e (patch) | |
| tree | 3b61379600a2ea165713fd6663fa3c8efa37083e /src/qml/qml/qqmlproperty.cpp | |
| parent | d0025a064cc36b4076a33fbda2c6b48afecfd13b (diff) | |
Use V4 double-to-string conversion instead of QVariant's
V4's version makes an effort to find the shortest possible
representation, which QVariant doesn't do.
Task-number: QTBUG-47070
Change-Id: I49ce130020496592325074e0db29a6984ee7649a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlproperty.cpp')
| -rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index c1120b4542..d3f7070528 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -50,6 +50,7 @@ #include "qqmlvaluetypeproxybinding_p.h" #include <private/qjsvalue_p.h> #include <private/qv4functionobject_p.h> +#include <private/qv4runtime_p.h> #include <QStringList> #include <private/qmetaobject_p.h> @@ -1350,7 +1351,12 @@ bool QQmlPropertyPrivate::write(QObject *object, if (!ok) { v = value; - if (v.convert(propertyType)) { + if (variantType == QVariant::Double && propertyType == QVariant::String) { + QString number; + QV4::RuntimeHelpers::numberToString(&number, v.toDouble()); + v = number; + ok = true; + } else if (v.convert(propertyType)) { ok = true; } else if (v.isValid() && value.isNull()) { // For historical reasons converting a null QVariant to another type will do the trick |