aboutsummaryrefslogtreecommitdiffstats
path: root/examples/declarative/painteditem
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-02-21 10:55:34 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-23 09:05:49 +0100
commitfb3889a423365b1736cae8850cdb2b3ac77b14a8 (patch)
tree65d7c1f7db7de65035ab91a16a136c4556f026bd /examples/declarative/painteditem
parentdc3165178851b9bda71dd238c8a5faca4dfa7a45 (diff)
Use new plugin system in QtDeclarative.
- Use prefix "org.qt-project" for interfaces. - Use new macros, add json files. Change-Id: I53df83f95153c5c9c462098584606284470a5ae0 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'examples/declarative/painteditem')
-rw-r--r--examples/declarative/painteditem/textballoons/TextBalloonPlugin/plugin.h3
-rw-r--r--examples/declarative/painteditem/textballoons/TextBalloonPlugin/textballoon.json1
-rw-r--r--examples/declarative/painteditem/textballoons/textballoons.pro2
3 files changed, 4 insertions, 2 deletions
diff --git a/examples/declarative/painteditem/textballoons/TextBalloonPlugin/plugin.h b/examples/declarative/painteditem/textballoons/TextBalloonPlugin/plugin.h
index 6be8611dfd..f444d31f4e 100644
--- a/examples/declarative/painteditem/textballoons/TextBalloonPlugin/plugin.h
+++ b/examples/declarative/painteditem/textballoons/TextBalloonPlugin/plugin.h
@@ -46,11 +46,10 @@
class TextBalloonPlugin : public QDeclarativeExtensionPlugin
{
Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface" FILE "textballoon.json")
public:
void registerTypes(const char *uri)
{
qmlRegisterType<TextBalloon>(uri, 1, 0, "TextBalloon");
}
};
-
-Q_EXPORT_PLUGIN2(qmltextballoonplugin, TextBalloonPlugin);
diff --git a/examples/declarative/painteditem/textballoons/TextBalloonPlugin/textballoon.json b/examples/declarative/painteditem/textballoons/TextBalloonPlugin/textballoon.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/examples/declarative/painteditem/textballoons/TextBalloonPlugin/textballoon.json
@@ -0,0 +1 @@
+{}
diff --git a/examples/declarative/painteditem/textballoons/textballoons.pro b/examples/declarative/painteditem/textballoons/textballoons.pro
index 453a00336d..e0b9404f65 100644
--- a/examples/declarative/painteditem/textballoons/textballoons.pro
+++ b/examples/declarative/painteditem/textballoons/textballoons.pro
@@ -9,6 +9,8 @@ HEADERS += TextBalloonPlugin/plugin.h \
SOURCES += textballoon.cpp
+OTHER_FILES += textballoon.json
+
DESTDIR = TextBalloonPlugin
qdeclarativesources.files += \