From: Friedemann Kleint Date: Tue, 9 Apr 2013 08:22:49 +0000 (+0200) Subject: Fix plugin export macros in Qt Designer documentation. X-Git-Tag: accepted/tizen/20131212.181521~101^2~35 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bfdf4e3b988e4c3517e185306293af495491952c;p=platform%2Fupstream%2Fqttools.git 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ö Reviewed-by: Jerome Pasion --- 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 17d270b..7fe9447 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 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]