diff options
| author | artoka <arto.katajasalo@digia.com> | 2011-11-17 14:49:55 (GMT) |
|---|---|---|
| committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-11-17 14:59:09 (GMT) |
| commit | 6be109dc4c08c5274d7ebf905e0148118ee28e89 (patch) | |
| tree | ab161f0e4ab73cbf612391c8842b25831a331797 /examples/declarative/positioners/qml | |
| parent | f69029f44ef3bdd07c3adaa011333c307a7ed48b (diff) | |
| download | Qt-6be109dc4c08c5274d7ebf905e0148118ee28e89.zip Qt-6be109dc4c08c5274d7ebf905e0148118ee28e89.tar.gz Qt-6be109dc4c08c5274d7ebf905e0148118ee28e89.tar.bz2 | |
positioners example modifications
Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.
Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'examples/declarative/positioners/qml')
| -rw-r--r-- | examples/declarative/positioners/qml/positioners.qmlproject | 18 | ||||
| -rw-r--r-- | examples/declarative/positioners/qml/positioners/Button.qml (renamed from examples/declarative/positioners/qml/Button.qml) | 0 | ||||
| -rw-r--r-- | examples/declarative/positioners/qml/positioners/add.png (renamed from examples/declarative/positioners/qml/add.png) | bin | 810 -> 810 bytes | |||
| -rw-r--r-- | examples/declarative/positioners/qml/positioners/del.png (renamed from examples/declarative/positioners/qml/del.png) | bin | 488 -> 488 bytes | |||
| -rw-r--r-- | examples/declarative/positioners/qml/positioners/positioners.qml (renamed from examples/declarative/positioners/qml/positioners.qml) | 0 |
5 files changed, 0 insertions, 18 deletions
diff --git a/examples/declarative/positioners/qml/positioners.qmlproject b/examples/declarative/positioners/qml/positioners.qmlproject deleted file mode 100644 index e526217..0000000 --- a/examples/declarative/positioners/qml/positioners.qmlproject +++ /dev/null @@ -1,18 +0,0 @@ -/* File generated by QtCreator */ - -import QmlProject 1.0 - -Project { - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - // importPaths: [ " ../exampleplugin " ] -} diff --git a/examples/declarative/positioners/qml/Button.qml b/examples/declarative/positioners/qml/positioners/Button.qml index 32e5993..32e5993 100644 --- a/examples/declarative/positioners/qml/Button.qml +++ b/examples/declarative/positioners/qml/positioners/Button.qml diff --git a/examples/declarative/positioners/qml/add.png b/examples/declarative/positioners/qml/positioners/add.png Binary files differindex 1ee4542..1ee4542 100644 --- a/examples/declarative/positioners/qml/add.png +++ b/examples/declarative/positioners/qml/positioners/add.png diff --git a/examples/declarative/positioners/qml/del.png b/examples/declarative/positioners/qml/positioners/del.png Binary files differindex 8d2eaed..8d2eaed 100644 --- a/examples/declarative/positioners/qml/del.png +++ b/examples/declarative/positioners/qml/positioners/del.png diff --git a/examples/declarative/positioners/qml/positioners.qml b/examples/declarative/positioners/qml/positioners/positioners.qml index 6ae265e..6ae265e 100644 --- a/examples/declarative/positioners/qml/positioners.qml +++ b/examples/declarative/positioners/qml/positioners/positioners.qml |
