diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-23 12:26:10 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-27 13:28:21 +0100 |
commit | efde205586a70320d0525e941e5a1cd9657bdd30 (patch) | |
tree | 27101bae5d59a31bc6a52846d5fde76b8d529e5d /examples/tools/plugandpaintplugins | |
parent | 6df396286a3221d12e810c0aaa71c4aa68db3331 (diff) |
Use new plugin system in qtbase.
- AccessibleWidgets
- Windows printer support
- Examples
Change-Id: Icc162bd7fc284b3c76d9966210f983728085c743
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'examples/tools/plugandpaintplugins')
8 files changed, 8 insertions, 8 deletions
diff --git a/examples/tools/plugandpaintplugins/basictools/basictools.json b/examples/tools/plugandpaintplugins/basictools/basictools.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/examples/tools/plugandpaintplugins/basictools/basictools.json @@ -0,0 +1 @@ +{} diff --git a/examples/tools/plugandpaintplugins/basictools/basictools.pro b/examples/tools/plugandpaintplugins/basictools/basictools.pro index 6175de34a3..89023d19cc 100644 --- a/examples/tools/plugandpaintplugins/basictools/basictools.pro +++ b/examples/tools/plugandpaintplugins/basictools/basictools.pro @@ -4,6 +4,7 @@ CONFIG += plugin static INCLUDEPATH += ../.. HEADERS = basictoolsplugin.h SOURCES = basictoolsplugin.cpp +OTHER_FILES += basictools.json TARGET = $$qtLibraryTarget(pnp_basictools) DESTDIR = ../../plugandpaint/plugins #! [0] diff --git a/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp b/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp index d55048dc0c..bbcae608fa 100644 --- a/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp +++ b/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp @@ -189,9 +189,3 @@ QImage BasicToolsPlugin::filterImage(const QString &filter, const QImage &image, return result; } //! [8] - -QT_BEGIN_NAMESPACE -//! [9] -Q_EXPORT_PLUGIN2(pnp_basictools, BasicToolsPlugin) -//! [9] -QT_END_NAMESPACE diff --git a/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h b/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h index c857e4c7a0..a895b60a18 100644 --- a/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h +++ b/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h @@ -43,6 +43,7 @@ #include <QRect> #include <QObject> +#include <QtPlugin> #include <QStringList> #include <QPainterPath> #include <QImage> @@ -57,6 +58,7 @@ class BasicToolsPlugin : public QObject, public FilterInterface { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.PlugAndPaint.BrushInterface" FILE "basictools.json") Q_INTERFACES(BrushInterface ShapeInterface FilterInterface) //! [0] diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.json b/examples/tools/plugandpaintplugins/extrafilters/extrafilters.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/examples/tools/plugandpaintplugins/extrafilters/extrafilters.json @@ -0,0 +1 @@ +{} diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro b/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro index 70e7c42c76..89acbabb23 100644 --- a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro +++ b/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro @@ -4,6 +4,7 @@ CONFIG += plugin INCLUDEPATH += ../.. HEADERS = extrafiltersplugin.h SOURCES = extrafiltersplugin.cpp +OTHER_FILES += extrafilters.json TARGET = $$qtLibraryTarget(pnp_extrafilters) DESTDIR = ../../plugandpaint/plugins diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp b/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp index 9303fbb6a6..186f364b77 100644 --- a/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp +++ b/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp @@ -120,5 +120,3 @@ QImage ExtraFiltersPlugin::filterImage(const QString &filter, } return result; } - -Q_EXPORT_PLUGIN2(pnp_extrafilters, ExtraFiltersPlugin) diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h b/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h index b88febe347..6693287294 100644 --- a/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h +++ b/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h @@ -43,6 +43,7 @@ //! [0] #include <QObject> +#include <QtPlugin> #include <QStringList> #include <QImage> @@ -51,6 +52,7 @@ class ExtraFiltersPlugin : public QObject, public FilterInterface { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.PlugAndPaint.FilterInterface" FILE "extrafilters.json") Q_INTERFACES(FilterInterface) public: |