From efde205586a70320d0525e941e5a1cd9657bdd30 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 23 Feb 2012 12:26:10 +0100 Subject: Use new plugin system in qtbase. - AccessibleWidgets - Windows printer support - Examples Change-Id: Icc162bd7fc284b3c76d9966210f983728085c743 Reviewed-by: Lars Knoll --- src/plugins/printsupport/windows/main.cpp | 4 ++-- src/plugins/printsupport/windows/windows.json | 3 +++ src/plugins/printsupport/windows/windows.pro | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 src/plugins/printsupport/windows/windows.json (limited to 'src/plugins/printsupport') diff --git a/src/plugins/printsupport/windows/main.cpp b/src/plugins/printsupport/windows/main.cpp index baf18504ee..e29705a8a7 100644 --- a/src/plugins/printsupport/windows/main.cpp +++ b/src/plugins/printsupport/windows/main.cpp @@ -50,6 +50,8 @@ QT_BEGIN_NAMESPACE class QWindowsPrinterSupportPlugin : public QPlatformPrinterSupportPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.QPlatformPrinterSupportFactoryInterface" FILE "windows.json") + public: QStringList keys() const; QPlatformPrinterSupport *create(const QString &); @@ -67,8 +69,6 @@ QPlatformPrinterSupport *QWindowsPrinterSupportPlugin::create(const QString &key return 0; } -Q_EXPORT_PLUGIN2(windowsprint, QWindowsPrinterSupportPlugin) - QT_END_NAMESPACE #include "main.moc" diff --git a/src/plugins/printsupport/windows/windows.json b/src/plugins/printsupport/windows/windows.json new file mode 100644 index 0000000000..803052854e --- /dev/null +++ b/src/plugins/printsupport/windows/windows.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "windowsprintsupport" ] +} diff --git a/src/plugins/printsupport/windows/windows.pro b/src/plugins/printsupport/windows/windows.pro index 2032125f4b..97d90a6a9d 100644 --- a/src/plugins/printsupport/windows/windows.pro +++ b/src/plugins/printsupport/windows/windows.pro @@ -15,6 +15,8 @@ SOURCES += \ HEADERS += \ qwindowsprintersupport.h +OTHER_FILES += windows.json + target.path += $$[QT_INSTALL_PLUGINS]/printsupport INSTALLS += target LIBS += -lWinspool -lComdlg32 -- cgit v1.2.3