From 929935dd693058d898b57c98c97cf5e7401c42ec Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Mon, 27 Feb 2012 08:40:31 +1000 Subject: [PATCH] Examples refactor rebase Automatic rebase did not move some new files to where they should have gone. Change-Id: I25515d29d8992acde15db0df1bb5972e35573e60 Reviewed-by: Martin Jones --- examples/declarative/cppextensions/qwidgets/qwidgets.json | 1 - .../{declarative => qml}/cppextensions/imageprovider/imageprovider.json | 0 examples/{declarative => qml}/cppextensions/plugins/plugin.json | 0 .../painteditem/textballoons}/textballoon.json | 0 .../tutorials/extending/chapter6-plugins/chartsplugin.json | 0 5 files changed, 1 deletion(-) delete mode 100644 examples/declarative/cppextensions/qwidgets/qwidgets.json rename examples/{declarative => qml}/cppextensions/imageprovider/imageprovider.json (100%) rename examples/{declarative => qml}/cppextensions/plugins/plugin.json (100%) rename examples/{declarative/painteditem/textballoons/TextBalloonPlugin => qtquick/painteditem/textballoons}/textballoon.json (100%) rename examples/{declarative => }/tutorials/extending/chapter6-plugins/chartsplugin.json (100%) diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.json b/examples/declarative/cppextensions/qwidgets/qwidgets.json deleted file mode 100644 index 0967ef4..0000000 --- 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 similarity index 100% rename from examples/declarative/cppextensions/imageprovider/imageprovider.json rename to examples/qml/cppextensions/imageprovider/imageprovider.json diff --git a/examples/declarative/cppextensions/plugins/plugin.json b/examples/qml/cppextensions/plugins/plugin.json similarity index 100% rename from examples/declarative/cppextensions/plugins/plugin.json rename to examples/qml/cppextensions/plugins/plugin.json diff --git a/examples/declarative/painteditem/textballoons/TextBalloonPlugin/textballoon.json b/examples/qtquick/painteditem/textballoons/textballoon.json similarity index 100% rename from examples/declarative/painteditem/textballoons/TextBalloonPlugin/textballoon.json rename to 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 similarity index 100% rename from examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.json rename to examples/tutorials/extending/chapter6-plugins/chartsplugin.json -- 2.7.4