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/plugandpaint/interfaces.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/plugandpaint/interfaces.h')
| -rw-r--r-- | examples/tools/plugandpaint/interfaces.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/examples/tools/plugandpaint/interfaces.h b/examples/tools/plugandpaint/interfaces.h index e48683cf68..5c1e0c302d 100644 --- a/examples/tools/plugandpaint/interfaces.h +++ b/examples/tools/plugandpaint/interfaces.h @@ -96,14 +96,18 @@ public: QT_BEGIN_NAMESPACE //! [3] //! [4] -Q_DECLARE_INTERFACE(BrushInterface, - "com.trolltech.PlugAndPaint.BrushInterface/1.0") +#define BrushInterface_iid "org.qt-project.Qt.Examples.PlugAndPaint.BrushInterface" + +Q_DECLARE_INTERFACE(BrushInterface, BrushInterface_iid) //! [3] -Q_DECLARE_INTERFACE(ShapeInterface, - "com.trolltech.PlugAndPaint.ShapeInterface/1.0") + +#define ShapeInterface_iid "org.qt-project.Qt.Examples.PlugAndPaint.ShapeInterface" + +Q_DECLARE_INTERFACE(ShapeInterface, ShapeInterface_iid) //! [5] -Q_DECLARE_INTERFACE(FilterInterface, - "com.trolltech.PlugAndPaint.FilterInterface/1.0") +#define FilterInterface_iid "org.qt-project.Qt.Examples.PlugAndPaint.FilterInterface" + +Q_DECLARE_INTERFACE(FilterInterface, FilterInterface_iid) //! [4] //! [5] QT_END_NAMESPACE |