Add support for translation bindings on QProperty based properties

Change-Id: I439653123cdc96df97a1801664655c9d28a8b9b5
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 23 insertions, 1 deletions

diff --git a/src/qml/qml/qqmlpropertybinding.cpp b/src/qml/qml/qqmlpropertybinding.cpp
index ca64cf412a..9fffafa649 100644
--- a/src/qml/qml/qqmlpropertybinding.cpp
+++ b/src/qml/qml/qqmlpropertybinding.cpp
@@ -57,7 +57,7 @@ QUntypedPropertyBinding QQmlPropertyBinding::create(const QQmlPropertyData *pd,
 
 void QQmlPropertyBinding::expressionChanged()
 {
-    setDirty(true);
+    markDirtyAndNotifyObservers();
 }
 
 QQmlPropertyBinding::QQmlPropertyBinding(const QMetaType &mt)
@@ -98,4 +98,26 @@ QUntypedPropertyBinding::BindingEvaluationResult QQmlPropertyBinding::evaluateAn
     return true;
 }
 
+QUntypedPropertyBinding QQmlTranslationPropertyBinding::create(const QQmlPropertyData *pd, const QQmlRefPointer<QV4::ExecutableCompilationUnit> &compilationUnit, const QV4::CompiledData::Binding *binding)
+{
+    auto translationBinding = [compilationUnit, binding](const QMetaType &metaType, void *dataPtr) {
+        // Create a dependency to the uiLanguage
+        QJSEnginePrivate::get(compilationUnit->engine)->uiLanguage.value();
+
+        QVariant resultVariant(compilationUnit->bindingValueAsString(binding));
+        if (metaType.id() != QMetaType::QString)
+            resultVariant.convert(metaType.id());
+
+        int compareResult = 0;
+        if (QMetaType::compare(dataPtr, resultVariant.constData(), metaType.id(), &compareResult)
+            && compareResult == 0)
+            return false;
+        QMetaType::destruct(metaType.id(), dataPtr);
+        QMetaType::construct(metaType.id(), dataPtr, resultVariant.constData());
+        return true;
+    };
+
+    return QUntypedPropertyBinding(QMetaType(pd->propType()), translationBinding, QPropertyBindingSourceLocation());
+}
+
 QT_END_NAMESPACE