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 /src/plugins | |
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 'src/plugins')
-rw-r--r-- | src/plugins/accessible/widgets/main.cpp | 10 | ||||
-rw-r--r-- | src/plugins/accessible/widgets/widgets.json | 52 | ||||
-rw-r--r-- | src/plugins/printsupport/windows/main.cpp | 4 | ||||
-rw-r--r-- | src/plugins/printsupport/windows/windows.json | 3 | ||||
-rw-r--r-- | src/plugins/printsupport/windows/windows.pro | 2 |
5 files changed, 64 insertions, 7 deletions
diff --git a/src/plugins/accessible/widgets/main.cpp b/src/plugins/accessible/widgets/main.cpp index dfa9594d5b..ca8bf816b6 100644 --- a/src/plugins/accessible/widgets/main.cpp +++ b/src/plugins/accessible/widgets/main.cpp @@ -61,6 +61,9 @@ QT_BEGIN_NAMESPACE class AccessibleFactory : public QAccessiblePlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QAccessibleFactoryInterface" FILE "widgets.json") + public: AccessibleFactory(); @@ -109,7 +112,6 @@ QStringList AccessibleFactory::keys() const list << QLatin1String("QStatusBar"); list << QLatin1String("QProgressBar"); list << QLatin1String("QMenuBar"); - list << QLatin1String("Q3PopupMenu"); list << QLatin1String("QMenu"); list << QLatin1String("QHeaderView"); list << QLatin1String("QTabBar"); @@ -251,8 +253,6 @@ QAccessibleInterface *AccessibleFactory::create(const QString &classname, QObjec #ifndef QT_NO_MENU } else if (classname == QLatin1String("QMenu")) { iface = new QAccessibleMenu(widget); - } else if (classname == QLatin1String("Q3PopupMenu")) { - iface = new QAccessibleMenu(widget); #endif #ifndef QT_NO_ITEMVIEWS } else if (classname == QLatin1String("QAbstractItemView")) { @@ -345,9 +345,9 @@ QAccessibleInterface *AccessibleFactory::create(const QString &classname, QObjec return iface; } -Q_EXPORT_STATIC_PLUGIN(AccessibleFactory) -Q_EXPORT_PLUGIN2(qtaccessiblewidgets, AccessibleFactory) QT_END_NAMESPACE +#include "main.moc" + #endif // QT_NO_ACCESSIBILITY diff --git a/src/plugins/accessible/widgets/widgets.json b/src/plugins/accessible/widgets/widgets.json new file mode 100644 index 0000000000..fdeb6f2b52 --- /dev/null +++ b/src/plugins/accessible/widgets/widgets.json @@ -0,0 +1,52 @@ +{ + "Keys": [ + "QLineEdit", + "QComboBox", + "QAbstractSpinBox", + "QSpinBox", + "QDoubleSpinBox", + "QScrollBar", + "QSlider", + "QAbstractSlider", + "QToolButton", + "QCheckBox", + "QRadioButton", + "QPushButton", + "QAbstractButton", + "QDialog", + "QMessageBox", + "QMainWindow", + "QLabel", + "QLCDNumber", + "QGroupBox", + "QStatusBar", + "QProgressBar", + "QMenuBar", + "QMenu", + "QHeaderView", + "QTabBar", + "QToolBar", + "QWorkspaceChild", + "QSizeGrip", + "QAbstractItemView", + "QWidget", + "QSplitter", + "QSplitterHandle", + "QTextEdit", + "QTipLabel", + "QFrame", + "QStackedWidget", + "QToolBox", + "QMdiArea", + "QMdiSubWindow", + "QWorkspace", + "QDialogButtonBox", + "QDial", + "QRubberBand", + "QTextBrowser", + "QAbstractScrollArea", + "QScrollArea", + "QCalendarWidget", + "QDockWidget", + "QAccessibleWidget" ] +} 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 |