summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qmlparser
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-07-16 07:08:50 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-07-16 07:08:50 (GMT)
commitd71ef06fc1261968b8c5ecf7a438db02e2654b29 (patch)
treef530a2b311bea40e13fdfe2bb2da0ccb4aa72b65 /tests/auto/declarative/qmlparser
parentd080c1c2ded0d59974f86f9f3dac91b099bda0a9 (diff)
downloadQt-d71ef06fc1261968b8c5ecf7a438db02e2654b29.zip
Qt-d71ef06fc1261968b8c5ecf7a438db02e2654b29.tar.gz
Qt-d71ef06fc1261968b8c5ecf7a438db02e2654b29.tar.bz2
Protect against overriding FINAL properties
Diffstat (limited to 'tests/auto/declarative/qmlparser')
-rw-r--r--tests/auto/declarative/qmlparser/finalOverride.errors.txt1
-rw-r--r--tests/auto/declarative/qmlparser/finalOverride.txt3
-rw-r--r--tests/auto/declarative/qmlparser/testtypes.h2
-rw-r--r--tests/auto/declarative/qmlparser/tst_qmlparser.cpp1
4 files changed, 6 insertions, 1 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/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()