From f2cd51abd592a4da45892e42f0d38803e7c1620e Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Tue, 16 Nov 2010 10:15:05 +1000
Subject: Treat easing.type: Easing.InOutQuad as a literal assignment, not
 binding

This was already being done for most enum assignments, but wasn't being
done for value types. This patch extends the optimization for enums
in a value type.

Reviewed-by: Martin Jones
---
 src/declarative/qml/qdeclarativecompiler.cpp | 34 ++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index b2740b8..b371f52 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -1836,14 +1836,22 @@ bool QDeclarativeCompiler::buildValueTypeProperty(QObject *type,
                 COMPILE_EXCEPTION(prop, tr("Unexpected object assignment"));
             } else if (value->value.isScript()) {
                 // ### Check for writability
-                BindingReference reference;
-                reference.expression = value->value;
-                reference.property = prop;
-                reference.value = value;
-                reference.bindingContext = ctxt;
-                reference.bindingContext.owner++;
-                addBindingReference(reference);
-                value->type = Value::PropertyBinding;
+
+                //optimization for <Type>.<EnumValue> enum assignments
+                bool isEnumAssignment = false;
+                COMPILE_CHECK(testQualifiedEnumAssignment(p, obj, value, &isEnumAssignment));
+                if (isEnumAssignment) {
+                    value->type = Value::Literal;
+                } else {
+                    BindingReference reference;
+                    reference.expression = value->value;
+                    reference.property = prop;
+                    reference.value = value;
+                    reference.bindingContext = ctxt;
+                    reference.bindingContext.owner++;
+                    addBindingReference(reference);
+                    value->type = Value::PropertyBinding;
+                }
             } else  {
                 COMPILE_CHECK(testLiteralAssignment(p, value));
                 value->type = Value::Literal;
@@ -2138,7 +2146,15 @@ bool QDeclarativeCompiler::testQualifiedEnumAssignment(const QMetaProperty &prop
     QDeclarativeType *type = 0;
     unit->imports().resolveType(typeName.toUtf8(), &type, 0, 0, 0, 0);
 
-    if (!type || obj->typeName != type->qmlTypeName())
+    //handle enums on value types (where obj->typeName is empty)
+    QByteArray objTypeName = obj->typeName;
+    if (objTypeName.isEmpty()) {
+        QDeclarativeType *objType = toQmlType(obj);
+        if (objType)
+            objTypeName = objType->qmlTypeName();
+    }
+
+    if (!type || objTypeName != type->qmlTypeName())
         return true;
 
     QString enumValue = parts.at(1);
-- 
cgit v0.12