diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-09 14:32:32 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-09 14:32:32 +0100 |
| commit | e3f7da72ac5b4540f88bb5cbd91a4917ba84334a (patch) | |
| tree | 3f05c1cf965fe291685c383f04b0bec87b05095b /src/qml/qml/qqmlbinding.cpp | |
| parent | 4cc883452b37dbe3148064150dc2f6b282b6b816 (diff) | |
| parent | 2e8a45d99f94cbd2c805dd3de56d60d9baa9bd4e (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
src/qml/memory/qv4mm.cpp
src/qml/qml/qqmlbinding.cpp
Change-Id: I98e51ef5af12691196da5772a07d3d53d213efcc
Diffstat (limited to 'src/qml/qml/qqmlbinding.cpp')
| -rw-r--r-- | src/qml/qml/qqmlbinding.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index 56ab259229..11a1e6edee 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -306,7 +306,7 @@ public: } void doUpdate(const DeleteWatcher &watcher, - QQmlPropertyData::WriteFlags flags, QV4::Scope &) override final + QQmlPropertyData::WriteFlags flags, QV4::Scope &scope) override final { if (watcher.wasDeleted()) return; @@ -322,7 +322,12 @@ public: QQmlPropertyData vpd; getPropertyData(&pd, &vpd); Q_ASSERT(pd); - doStore(result, pd, flags); + if (pd->propType() == QMetaType::QString) { + doStore(result, pd, flags); + } else { + QV4::ScopedString value(scope, scope.engine->newString(result)); + slowWrite(*pd, vpd, value, /*isUndefined*/false, flags); + } } private: |