diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-01-27 03:49:12 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-01-27 03:49:12 (GMT) |
| commit | d9e4393ef212dba9eeba68277b270d68bcdbc733 (patch) | |
| tree | d65ff0df673db66478b081d672f3fe383ae6e5a5 /tests/auto/declarative/qdeclarativelanguage/data | |
| parent | f15778e60ba538b8715f6433a472ffe08a21d934 (diff) | |
| download | Qt-d9e4393ef212dba9eeba68277b270d68bcdbc733.zip Qt-d9e4393ef212dba9eeba68277b270d68bcdbc733.tar.gz Qt-d9e4393ef212dba9eeba68277b270d68bcdbc733.tar.bz2 | |
Implement property versioning inside the declarative engine
Task-number: QTBUG-13451
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data')
9 files changed, 18 insertions, 21 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/allowedRevisionOverloads.qml b/tests/auto/declarative/qdeclarativelanguage/data/allowedRevisionOverloads.qml new file mode 100644 index 0000000..64acbd1 --- /dev/null +++ b/tests/auto/declarative/qdeclarativelanguage/data/allowedRevisionOverloads.qml @@ -0,0 +1,6 @@ +import Test 1.0 + +MyRevisionedLegalOverload +{ +} + diff --git a/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.errors.txt new file mode 100644 index 0000000..e9b449d --- /dev/null +++ b/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.errors.txt @@ -0,0 +1 @@ +3:1:Type Test/MyRevisionedIllegalOverload 1.0 contains an illegal property "propA". This is an error in the type's implementation. diff --git a/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.qml b/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.qml new file mode 100644 index 0000000..612bcfe --- /dev/null +++ b/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.qml @@ -0,0 +1,7 @@ +import Test 1.0 + +MyRevisionedIllegalOverload +{ +} + + diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.errors.txt index 6ad6bfa..29342dc 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.errors.txt +++ b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.errors.txt @@ -1 +1 @@ -7:5:Property "prop2" not available in Test/MyRevisionedClass 1.0 +8:5:"MyRevisionedClass.prop2" is not available in Test 1.0. diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml index 4662d5e..4b37ed3 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml @@ -1,3 +1,4 @@ +// Check that a property in a later revision (prop2) cannot be assigned import QtQuick 1.0 import Test 1.0 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.errors.txt index 92ccd9a..57b5764 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.errors.txt +++ b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.errors.txt @@ -1 +1 @@ -6:5:Signal "onSignal2" not available in Test/MyRevisionedClass 1.0 +6:5:"MyRevisionedClass.onSignal2" is not available in Test 1.0. diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.errors.txt index b3c33c4..45364a0 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.errors.txt +++ b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.errors.txt @@ -1 +1 @@ -9:5:Property "propD" not available in Test/MyRevisionedClass 1.1 +9:5:"MyRevisionedClass.propD" is not available in Test 1.1. diff --git a/tests/auto/declarative/qdeclarativelanguage/data/revisions10.qml b/tests/auto/declarative/qdeclarativelanguage/data/revisions10.qml deleted file mode 100644 index c4974cf..0000000 --- a/tests/auto/declarative/qdeclarativelanguage/data/revisions10.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 1.0 -import Test 1.0 - -MyRevisionedClass -{ - property real prop2: 10 - prop1: 1 -} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/revisionssub10.qml b/tests/auto/declarative/qdeclarativelanguage/data/revisionssub10.qml deleted file mode 100644 index b5de4a3..0000000 --- a/tests/auto/declarative/qdeclarativelanguage/data/revisionssub10.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 1.0 -import Test 1.0 - -MyRevisionedSubclass -{ - property real prop4: 10 - property real prop2: 10 - prop1: 5 - prop3: 7 -} |