Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro

Change-Id: I3ca8f0422828191b7e19539c25f31f2d048e9f18

1 files changed, 16 insertions, 8 deletions

diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp
index a708e90116..33716d57b8 100644
--- a/src/qml/compiler/qqmltypecompiler.cpp
+++ b/src/qml/compiler/qqmltypecompiler.cpp
@@ -1163,6 +1163,17 @@ struct StaticQtMetaObject : public QObject
         { return &staticQtMetaObject; }
 };
 
+bool QQmlEnumTypeResolver::assignEnumToBinding(QmlIR::Binding *binding, const QString &enumName, int enumValue, bool isQtObject)
+{
+    if (enumName.length() > 0 && enumName[0].isLower() && !isQtObject) {
+        COMPILE_EXCEPTION(binding, tr("Invalid property assignment: Enum value \"%1\" cannot start with a lowercase letter").arg(enumName));
+    }
+    binding->type = QV4::CompiledData::Binding::Type_Number;
+    binding->value.d = (double)enumValue;
+    binding->flags |= QV4::CompiledData::Binding::IsResolvedEnum;
+    return true;
+}
+
 bool QQmlEnumTypeResolver::tryQualifiedEnumAssignment(const QmlIR::Object *obj, const QQmlPropertyCache *propertyCache, const QQmlPropertyData *prop, QmlIR::Binding *binding)
 {
     bool isIntProp = (prop->propType == QMetaType::Int) && !prop->isEnum();
@@ -1185,6 +1196,7 @@ bool QQmlEnumTypeResolver::tryQualifiedEnumAssignment(const QmlIR::Object *obj,
         return true;
 
     QHashedStringRef typeName(string.constData(), dot);
+    const bool isQtObject = (typeName == QLatin1String("Qt"));
     QString enumValue = string.mid(dot+1);
 
     if (isIntProp) {
@@ -1192,16 +1204,15 @@ bool QQmlEnumTypeResolver::tryQualifiedEnumAssignment(const QmlIR::Object *obj,
         bool ok;
         int enumval = evaluateEnum(typeName.toString(), enumValue.toUtf8(), &ok);
         if (ok) {
-            binding->type = QV4::CompiledData::Binding::Type_Number;
-            binding->value.d = (double)enumval;
-            binding->flags |= QV4::CompiledData::Binding::IsResolvedEnum;
+            if (!assignEnumToBinding(binding, enumValue, enumval, isQtObject))
+                return false;
         }
         return true;
     }
     QQmlType *type = 0;
     imports->resolveType(typeName, &type, 0, 0, 0);
 
-    if (!type && typeName != QLatin1String("Qt"))
+    if (!type && !isQtObject)
         return true;
 
     int value = 0;
@@ -1234,10 +1245,7 @@ bool QQmlEnumTypeResolver::tryQualifiedEnumAssignment(const QmlIR::Object *obj,
     if (!ok)
         return true;
 
-    binding->type = QV4::CompiledData::Binding::Type_Number;
-    binding->value.d = (double)value;
-    binding->flags |= QV4::CompiledData::Binding::IsResolvedEnum;
-    return true;
+    return assignEnumToBinding(binding, enumValue, value, isQtObject);
 }
 
 int QQmlEnumTypeResolver::evaluateEnum(const QString &scope, const QByteArray &enumValue, bool *ok) const