Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

8 files changed, 26 insertions, 4 deletions

diff --git a/tests/auto/declarative/qmlparser/finalOverride.errors.txt b/tests/auto/declarative/qmlparser/finalOverride.errors.txt
new file mode 100644
index 0000000..fc7070c
--- /dev/null
+++ b/tests/auto/declarative/qmlparser/finalOverride.errors.txt
@@ -0,0 +1 @@
+2:5:Cannot override FINAL property
diff --git a/tests/auto/declarative/qmlparser/finalOverride.txt b/tests/auto/declarative/qmlparser/finalOverride.txt
new file mode 100644
index 0000000..54ea6fb
--- /dev/null
+++ b/tests/auto/declarative/qmlparser/finalOverride.txt
@@ -0,0 +1,3 @@
+MyQmlObject {
+    property int value: 10
+}
diff --git a/tests/auto/declarative/qmlparser/listAssignment.1.errors.txt b/tests/auto/declarative/qmlparser/listAssignment.1.errors.txt
index 44a275b..8bcd71e 100644
--- a/tests/auto/declarative/qmlparser/listAssignment.1.errors.txt
+++ b/tests/auto/declarative/qmlparser/listAssignment.1.errors.txt
@@ -1 +1 @@
-1:1:Cannot assign primitives to lists
+2:24:Cannot assign primitives to lists
diff --git a/tests/auto/declarative/qmlparser/listAssignment.2.errors.txt b/tests/auto/declarative/qmlparser/listAssignment.2.errors.txt
index 572d662..312ba8a 100644
--- a/tests/auto/declarative/qmlparser/listAssignment.2.errors.txt
+++ b/tests/auto/declarative/qmlparser/listAssignment.2.errors.txt
@@ -1,2 +1,2 @@
-1:1:Cannot assign primitives to lists
+2:15:Cannot assign primitives to lists
 
diff --git a/tests/auto/declarative/qmlparser/listAssignment.3.errors.txt b/tests/auto/declarative/qmlparser/listAssignment.3.errors.txt
index ab6fec8..c52debf 100644
--- a/tests/auto/declarative/qmlparser/listAssignment.3.errors.txt
+++ b/tests/auto/declarative/qmlparser/listAssignment.3.errors.txt
@@ -1 +1 @@
-1:1:Can only assign one binding to lists
+3:15:Can only assign one binding to lists
diff --git a/tests/auto/declarative/qmlparser/testtypes.h b/tests/auto/declarative/qmlparser/testtypes.h
index ab67a4a..7528331 100644
--- a/tests/auto/declarative/qmlparser/testtypes.h
+++ b/tests/auto/declarative/qmlparser/testtypes.h
@@ -51,7 +51,7 @@ private:
 class MyQmlObject : public QObject, public MyInterface, public QmlParserStatus
 {
     Q_OBJECT
-    Q_PROPERTY(int value READ value WRITE setValue)
+    Q_PROPERTY(int value READ value WRITE setValue FINAL)
     Q_PROPERTY(QString readOnlyString READ readOnlyString)
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
     Q_PROPERTY(QRect rect READ rect WRITE setRect)
diff --git a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp
index 7023263..f722ca3 100644
--- a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp
+++ b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp
@@ -137,6 +137,7 @@ void tst_qmlparser::errors_data()
     QTest::newRow("missingObject") << "missingObject.txt" << "missingObject.errors.txt" << false;
     QTest::newRow("failingComponent") << "failingComponent.txt" << "failingComponent.errors.txt" << false;
     QTest::newRow("missingSignal") << "missingSignal.txt" << "missingSignal.errors.txt" << false;
+    QTest::newRow("finalOverride") << "finalOverride.txt" << "finalOverride.errors.txt" << false;
 }
 
 void tst_qmlparser::errors()
diff --git a/tests/auto/qmetaobject/tst_qmetaobject.cpp b/tests/auto/qmetaobject/tst_qmetaobject.cpp
index f4cff2b..ac2858c 100644
--- a/tests/auto/qmetaobject/tst_qmetaobject.cpp
+++ b/tests/auto/qmetaobject/tst_qmetaobject.cpp
@@ -109,6 +109,7 @@ class tst_QMetaObject : public QObject
     Q_PROPERTY(MyStruct value7 READ value7 WRITE setVal7 NOTIFY value7Changed)
     Q_PROPERTY(int value8 READ value8 NOTIFY value8Changed)
     Q_PROPERTY(int value9 READ value9 CONSTANT)
+    Q_PROPERTY(int value10 READ value10 FINAL)
 
 public:
     enum EnumType { EnumType1 };
@@ -140,6 +141,8 @@ public:
 
     int value9() const { return 1; }
 
+    int value10() const { return 1; }
+
     QList<QVariant> value4;
     QVariantList value5;
 
@@ -163,6 +166,7 @@ private slots:
     void checkScope();
     void propertyNotify();
     void propertyConstant();
+    void propertyFinal();
 
     void stdSet();
     void classInfo();
@@ -802,6 +806,19 @@ void tst_QMetaObject::propertyConstant()
     QVERIFY(prop.isConstant());
 }
 
+void tst_QMetaObject::propertyFinal()
+{
+    const QMetaObject *mo = metaObject();
+
+    QMetaProperty prop = mo->property(mo->indexOfProperty("value10"));
+    QVERIFY(prop.isValid());
+    QVERIFY(prop.isFinal());
+
+    prop = mo->property(mo->indexOfProperty("value9"));
+    QVERIFY(prop.isValid());
+    QVERIFY(!prop.isFinal());
+}
+
 class ClassInfoTestObjectA : public QObject
 {
     Q_OBJECT