summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-04-09 10:22:49 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-10 12:39:45 +0200
commitbfdf4e3b988e4c3517e185306293af495491952c (patch)
treedc10c91e9d6a52f8b0289e4365ec8978e4653301
parent687e709cc0000c99a0ceeb15de831cb54b0e7832 (diff)
downloadqttools-bfdf4e3b988e4c3517e185306293af495491952c.tar.gz
Fix plugin export macros in Qt Designer documentation.
Use Q_PLUGIN_METADATA instead of Q_EXPORT_PLUGIN2 . Task-number: QTBUG-30508 Change-Id: Iedc1e140d3f597e29911a38e5d5548e6ac9981b3 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp b/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp
index 17d270b83..7fe9447fa 100644
--- a/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp
+++ b/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp
@@ -230,6 +230,7 @@ QObject *AGeneralExtensionFactory::createExtension(QObject *object,
class MyCustomWidgets: public QObject, public QDesignerCustomWidgetCollectionInterface
{
Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface")
Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
public:
@@ -256,13 +257,11 @@ QList<QDesignerCustomWidgetInterface*> MyCustomWidgets::customWidgets() const
{
return widgets;
}
-
-Q_EXPORT_PLUGIN2(customwidgetsplugin, MyCustomWidgets)
//! [13]
//! [14]
-Q_EXPORT_PLUGIN2(customwidgetplugin, MyCustomWidget)
+Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface")
//! [14]