summaryrefslogtreecommitdiffstats
path: root/src/plugins/accessible/widgets
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-07-24 17:20:15 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-19 14:55:19 +0200
commitb449791c3565940e701c68b3f705014804af0c2b (patch)
tree89700eecb284d63e659499dea428c47254b04a2f /src/plugins/accessible/widgets
parent580d816bb855b9e9c0f3aec2863f7324e5849ab5 (diff)
Make Accessibility public
There is no point in having QAccessible2, so merge it with the normal QAccessible. The header will be removed in a subsequent commit as it is still needed by declarative at this point in time. Change-Id: I1fc47d484d482f25387eba827bc5a373536b7a8b Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src/plugins/accessible/widgets')
-rw-r--r--src/plugins/accessible/widgets/complexwidgets.h4
-rw-r--r--src/plugins/accessible/widgets/itemviews.cpp1
-rw-r--r--src/plugins/accessible/widgets/itemviews.h3
-rw-r--r--src/plugins/accessible/widgets/qaccessiblemenu.h2
-rw-r--r--src/plugins/accessible/widgets/qaccessiblewidgets.h3
-rw-r--r--src/plugins/accessible/widgets/rangecontrols.h3
-rw-r--r--src/plugins/accessible/widgets/simplewidgets.h3
7 files changed, 6 insertions, 13 deletions
diff --git a/src/plugins/accessible/widgets/complexwidgets.h b/src/plugins/accessible/widgets/complexwidgets.h
index 306eae4a72..4cb3d7201e 100644
--- a/src/plugins/accessible/widgets/complexwidgets.h
+++ b/src/plugins/accessible/widgets/complexwidgets.h
@@ -43,10 +43,8 @@
#define COMPLEXWIDGETS_H
#include <QtCore/qpointer.h>
-#include <QtWidgets/private/qaccessiblewidget_p.h>
+#include <QtWidgets/qaccessiblewidget.h>
#include <QtWidgets/qabstractitemview.h>
-#include <QtGui/private/qaccessible2_p.h>
-
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp
index 9dcf815cce..b477a6acb7 100644
--- a/src/plugins/accessible/widgets/itemviews.cpp
+++ b/src/plugins/accessible/widgets/itemviews.cpp
@@ -46,7 +46,6 @@
#include <qlistview.h>
#include <qtreeview.h>
#include <private/qtreewidget_p.h>
-#include <QtGui/private/qaccessible2_p.h>
#ifndef QT_NO_ACCESSIBILITY
diff --git a/src/plugins/accessible/widgets/itemviews.h b/src/plugins/accessible/widgets/itemviews.h
index 7692ce0e77..e3d8e3b8b7 100644
--- a/src/plugins/accessible/widgets/itemviews.h
+++ b/src/plugins/accessible/widgets/itemviews.h
@@ -44,8 +44,7 @@
#include "QtCore/qpointer.h"
#include <QtGui/qaccessible.h>
-#include <QtGui/private/qaccessible2_p.h>
-#include <QtWidgets/private/qaccessiblewidget_p.h>
+#include <QtWidgets/qaccessiblewidget.h>
#include <QtWidgets/qabstractitemview.h>
#include <QtWidgets/qheaderview.h>
diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.h b/src/plugins/accessible/widgets/qaccessiblemenu.h
index f933a4a37e..edd172dc60 100644
--- a/src/plugins/accessible/widgets/qaccessiblemenu.h
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.h
@@ -42,7 +42,7 @@
#ifndef QACCESSIBLEMENU_H
#define QACCESSIBLEMENU_H
-#include <QtWidgets/private/qaccessiblewidget_p.h>
+#include <QtWidgets/qaccessiblewidget.h>
#include <QtCore/qpointer.h>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.h b/src/plugins/accessible/widgets/qaccessiblewidgets.h
index c60a1d893e..e4cd824a40 100644
--- a/src/plugins/accessible/widgets/qaccessiblewidgets.h
+++ b/src/plugins/accessible/widgets/qaccessiblewidgets.h
@@ -42,8 +42,7 @@
#ifndef QACCESSIBLEWIDGETS_H
#define QACCESSIBLEWIDGETS_H
-#include <QtGui/private/qaccessible2_p.h>
-#include <QtWidgets/private/qaccessiblewidget_p.h>
+#include <QtWidgets/qaccessiblewidget.h>
#ifndef QT_NO_ACCESSIBILITY
diff --git a/src/plugins/accessible/widgets/rangecontrols.h b/src/plugins/accessible/widgets/rangecontrols.h
index a5bc11e1c8..3a5c848631 100644
--- a/src/plugins/accessible/widgets/rangecontrols.h
+++ b/src/plugins/accessible/widgets/rangecontrols.h
@@ -42,8 +42,7 @@
#ifndef RANGECONTROLS_H
#define RANGECONTROLS_H
-#include <QtWidgets/private/qaccessiblewidget_p.h>
-#include <QtGui/private/qaccessible2_p.h>
+#include <QtWidgets/qaccessiblewidget.h>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/accessible/widgets/simplewidgets.h b/src/plugins/accessible/widgets/simplewidgets.h
index f1426354f1..02ea5f758b 100644
--- a/src/plugins/accessible/widgets/simplewidgets.h
+++ b/src/plugins/accessible/widgets/simplewidgets.h
@@ -43,8 +43,7 @@
#define SIMPLEWIDGETS_H
#include <QtCore/qcoreapplication.h>
-#include <QtGui/private/qaccessible2_p.h>
-#include <QtWidgets/private/qaccessiblewidget_p.h>
+#include <QtWidgets/qaccessiblewidget.h>
QT_BEGIN_NAMESPACE