Protect against overriding FINAL properties

1 files changed, 10 insertions, 2 deletions

diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 182495a..b0bc6e8 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -160,8 +160,8 @@ bool QmlCompiler::isSignalPropertyName(const QByteArray &name)
         QString exceptionDescription; \
         QmlError error; \
         error.setUrl(output->url); \
-        error.setLine(token->location.start.line); \
-        error.setColumn(token->location.start.column); \
+        error.setLine((token)->location.start.line); \
+        error.setColumn((token)->location.start.column); \
         QDebug d(&exceptionDescription); \
         d << desc;  \
         error.setDescription(exceptionDescription.trimmed()); \
@@ -1738,6 +1738,14 @@ bool QmlCompiler::buildDynamicMeta(QmlParser::Object *obj, DynamicMetaMode mode)
     for (int ii = 0; ii < obj->dynamicProperties.count(); ++ii) {
         const Object::DynamicProperty &p = obj->dynamicProperties.at(ii);
 
+        int propIdx = 
+            obj->metaObject()->indexOfProperty(p.name.constData());
+        if (-1 != propIdx) {
+            QMetaProperty prop = obj->metaObject()->property(propIdx);
+            if (prop.isFinal())
+                COMPILE_EXCEPTION(&p, "Cannot override FINAL property");
+        }
+
         if (p.isDefaultProperty && 
             (p.type != Object::DynamicProperty::Alias || 
              mode == ResolveAliases))