aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlproperty.cpp
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@theqtcompany.com>2015-10-16 18:17:31 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-11-23 21:15:11 +0000
commitc8b4e0ae14ce34f24e6900de52b781588f8988e3 (patch)
tree38d7317dbd7070de77abfc1376e4ed17bedee46d /src/qml/qml/qqmlproperty.cpp
parent242067390f3bd891b162164a2d01a3a982c64fa2 (diff)
Remove libdouble-conversion
We can use facilities in qtbase to convert doubles to strings now. This also makes the fix to QTBUG-47070 obsolete. Change-Id: I2f813164ff788b96281c3ffd37d8d2c65665de80 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlproperty.cpp')
-rw-r--r--src/qml/qml/qqmlproperty.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
index 1b78ada698..bcfcf391f6 100644
--- a/src/qml/qml/qqmlproperty.cpp
+++ b/src/qml/qml/qqmlproperty.cpp
@@ -50,7 +50,6 @@
#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>
@@ -1353,12 +1352,7 @@ bool QQmlPropertyPrivate::write(QObject *object,
if (!ok) {
v = value;
- if (variantType == QVariant::Double && propertyType == QVariant::String) {
- QString number;
- QV4::RuntimeHelpers::numberToString(&number, v.toDouble());
- v = number;
- ok = true;
- } else if (v.convert(propertyType)) {
+ 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