diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2012-02-27 08:40:31 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-28 00:39:41 +0100 |
| commit | 929935dd693058d898b57c98c97cf5e7401c42ec (patch) | |
| tree | a58d5274ef699b60dd6e8f468739cf5b3cdb215c /examples | |
| parent | ccd859d2c47e926415c5b1307e84efd4197583c4 (diff) | |
Examples refactor rebase
Automatic rebase did not move some new files to where they should have
gone.
Change-Id: I25515d29d8992acde15db0df1bb5972e35573e60
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/cppextensions/qwidgets/qwidgets.json | 1 | ||||
| -rw-r--r-- | examples/qml/cppextensions/imageprovider/imageprovider.json (renamed from examples/declarative/cppextensions/imageprovider/imageprovider.json) | 0 | ||||
| -rw-r--r-- | examples/qml/cppextensions/plugins/plugin.json (renamed from examples/declarative/cppextensions/plugins/plugin.json) | 0 | ||||
| -rw-r--r-- | examples/qtquick/painteditem/textballoons/textballoon.json (renamed from examples/declarative/painteditem/textballoons/TextBalloonPlugin/textballoon.json) | 0 | ||||
| -rw-r--r-- | examples/tutorials/extending/chapter6-plugins/chartsplugin.json (renamed from examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.json) | 0 |
5 files changed, 0 insertions, 1 deletions
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.json b/examples/declarative/cppextensions/qwidgets/qwidgets.json deleted file mode 100644 index 0967ef424b..0000000000 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.json b/examples/qml/cppextensions/imageprovider/imageprovider.json index 0967ef424b..0967ef424b 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.json +++ b/examples/qml/cppextensions/imageprovider/imageprovider.json diff --git a/examples/declarative/cppextensions/plugins/plugin.json b/examples/qml/cppextensions/plugins/plugin.json index 0967ef424b..0967ef424b 100644 --- a/examples/declarative/cppextensions/plugins/plugin.json +++ b/examples/qml/cppextensions/plugins/plugin.json diff --git a/examples/declarative/painteditem/textballoons/TextBalloonPlugin/textballoon.json b/examples/qtquick/painteditem/textballoons/textballoon.json index 0967ef424b..0967ef424b 100644 --- a/examples/declarative/painteditem/textballoons/TextBalloonPlugin/textballoon.json +++ b/examples/qtquick/painteditem/textballoons/textballoon.json diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.json b/examples/tutorials/extending/chapter6-plugins/chartsplugin.json index 0967ef424b..0967ef424b 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.json +++ b/examples/tutorials/extending/chapter6-plugins/chartsplugin.json |