summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2011-03-01 07:57:03 (GMT)
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>2011-03-01 07:57:03 (GMT)
commite538957c77f71b1cc38a3c43c9f3157f65a3ff11 (patch)
tree3d013b12ba28668d127fe5532de5fc588fe63cb0 /tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml
parent67d5513b5aca096dfc33952cf81219087b0e41b0 (diff)
parent2653c4fcf42ec93db16a299c29c9fe0f98680c75 (diff)
downloadQt-e538957c77f71b1cc38a3c43c9f3157f65a3ff11.zip
Qt-e538957c77f71b1cc38a3c43c9f3157f65a3ff11.tar.gz
Qt-e538957c77f71b1cc38a3c43c9f3157f65a3ff11.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml')
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml b/tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml
new file mode 100644
index 0000000..f107356
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml
@@ -0,0 +1,12 @@
+import QtQuick 1.0
+import Test 1.1
+
+MyRevisionedSubclass
+{
+ prop1: 10
+ prop2: 10
+ prop3: 10
+ prop4: 10
+
+ onSignal4: prop4 = 2
+}