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/plugandpaint | |
| 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/plugandpaint')
| -rw-r--r-- | examples/tools/plugandpaint/interfaces.h | 16 | ||||
| -rw-r--r-- | examples/tools/plugandpaint/main.cpp | 4 |
2 files changed, 11 insertions, 9 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 diff --git a/examples/tools/plugandpaint/main.cpp b/examples/tools/plugandpaint/main.cpp index 841d5b417b..3c3693ec0b 100644 --- a/examples/tools/plugandpaint/main.cpp +++ b/examples/tools/plugandpaint/main.cpp @@ -43,9 +43,7 @@ #include <QtPlugin> #include <QApplication> -QT_BEGIN_NAMESPACE -Q_IMPORT_PLUGIN(pnp_basictools) -QT_END_NAMESPACE +Q_IMPORT_PLUGIN(BasicToolsPlugin) int main(int argc, char *argv[]) { |