Examples refactor rebase
authorAlan Alpert <alan.alpert@nokia.com>
Sun, 26 Feb 2012 22:40:31 +0000 (08:40 +1000)
committerQt by Nokia <qt-info@nokia.com>
Mon, 27 Feb 2012 23:39:41 +0000 (00:39 +0100)
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>
examples/declarative/cppextensions/qwidgets/qwidgets.json [deleted file]
examples/qml/cppextensions/imageprovider/imageprovider.json [moved from examples/declarative/cppextensions/imageprovider/imageprovider.json with 100% similarity]
examples/qml/cppextensions/plugins/plugin.json [moved from examples/declarative/cppextensions/plugins/plugin.json with 100% similarity]
examples/qtquick/painteditem/textballoons/textballoon.json [moved from examples/declarative/painteditem/textballoons/TextBalloonPlugin/textballoon.json with 100% similarity]
examples/tutorials/extending/chapter6-plugins/chartsplugin.json [moved from examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.json with 100% similarity]

diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.json b/examples/declarative/cppextensions/qwidgets/qwidgets.json
deleted file mode 100644 (file)
index 0967ef4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{}