From efde205586a70320d0525e941e5a1cd9657bdd30 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
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 <lars.knoll@nokia.com>
---
 src/plugins/accessible/widgets/main.cpp     | 10 +++---
 src/plugins/accessible/widgets/widgets.json | 52 +++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 src/plugins/accessible/widgets/widgets.json

(limited to 'src/plugins/accessible')

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" ]
+}
-- 
cgit v1.2.3