diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-19 04:39:03 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-19 04:39:03 (GMT) |
| commit | 78b1aa100d0a853ce1fe7df03a170887f461ede3 (patch) | |
| tree | 0002b3a4e5ad3972ea9768fffa901847b2b4598c /examples/declarative | |
| parent | cb1651a758e3da21905b50b701b69c48660be1cb (diff) | |
| download | Qt-78b1aa100d0a853ce1fe7df03a170887f461ede3.zip Qt-78b1aa100d0a853ce1fe7df03a170887f461ede3.tar.gz Qt-78b1aa100d0a853ce1fe7df03a170887f461ede3.tar.bz2 | |
update
Diffstat (limited to 'examples/declarative')
5 files changed, 21 insertions, 2 deletions
diff --git a/examples/declarative/modules/builtin-version.qml b/examples/declarative/modules/builtin-version.qml index 82055b4..69f64ed 100644 --- a/examples/declarative/modules/builtin-version.qml +++ b/examples/declarative/modules/builtin-version.qml @@ -1,5 +1,3 @@ import Qt 4.6 -import com.nokia.Qt 4.7 Rect {} -// and later... SuperRect{} diff --git a/examples/declarative/modules/lib/com/nokia/Foo/Bar.qml b/examples/declarative/modules/lib/com/nokia/Foo/Bar.qml new file mode 100644 index 0000000..270cd46 --- /dev/null +++ b/examples/declarative/modules/lib/com/nokia/Foo/Bar.qml @@ -0,0 +1,5 @@ +import Qt 4.6 +Text { + text: "lib/com/nokia/Foo/Bar.qml" + color: "green" +} diff --git a/examples/declarative/modules/lib/com/nokia/Foo/Bar17.qml b/examples/declarative/modules/lib/com/nokia/Foo/Bar17.qml new file mode 100644 index 0000000..f93fc62 --- /dev/null +++ b/examples/declarative/modules/lib/com/nokia/Foo/Bar17.qml @@ -0,0 +1,5 @@ +import Qt 4.6 +Text { + text: "lib/com/nokia/Foo/Bar17.qml" + color: "white" +} diff --git a/examples/declarative/modules/lib/com/nokia/Foo/Baz.qml b/examples/declarative/modules/lib/com/nokia/Foo/Baz.qml new file mode 100644 index 0000000..4daa37f --- /dev/null +++ b/examples/declarative/modules/lib/com/nokia/Foo/Baz.qml @@ -0,0 +1,5 @@ +import Qt 4.6 +Text { + text: "lib/com/nokia/Foo/Baz.qml" + color: "red" +} diff --git a/examples/declarative/modules/lib/com/nokia/Foo/qmldir b/examples/declarative/modules/lib/com/nokia/Foo/qmldir new file mode 100644 index 0000000..b8111cb --- /dev/null +++ b/examples/declarative/modules/lib/com/nokia/Foo/qmldir @@ -0,0 +1,6 @@ +# Baz was introduced in Foo 1.6 +# Bar 1.5 and 1.6 are the same, but in 1.7 it is reimplemented. +Bar 1.5 Bar.qml +Bar 1.6 Bar.qml +Bar 1.7 Bar17.qml +Baz 1.6 Baz.qml |