diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
| commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
| tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h | |
| parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h')
| -rw-r--r-- | examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h | 2 |
1 files changed, 2 insertions, 0 deletions
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] |