Enable accessibility again.

Revert "Disable accessibility temporarily."

This reverts commit 361015dc73b887026e1937da09c11df89acf5c85.

Change-Id: Ie1d053fe64ee79fbd9e57bf2d0d2764bb638db72
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

diff --git a/src/plugins/accessible/quick/qaccessiblequickview.h b/src/plugins/accessible/quick/qaccessiblequickview.h
index b8c02cb..3bfc4ab 100644 (file)
--- a/src/plugins/accessible/quick/qaccessiblequickview.h
+++ b/src/plugins/accessible/quick/qaccessiblequickview.h
@@ -42,7 +42,7 @@
 #ifndef QAccessibleQuickView_H
 #define QAccessibleQuickView_H
 
-#include <QtGui/qaccessible2.h>
+#include <QtGui/private/qaccessible2_p.h>
 #include <QtGui/qaccessibleobject.h>
 #include <QtQuick/qquickwindow.h>
 

diff --git a/src/plugins/accessible/shared/qqmlaccessible.h b/src/plugins/accessible/shared/qqmlaccessible.h
index 5eb8c3a..c6ac4e4 100644 (file)
--- a/src/plugins/accessible/shared/qqmlaccessible.h
+++ b/src/plugins/accessible/shared/qqmlaccessible.h
@@ -43,13 +43,9 @@
 #define QQMLACCESSIBLE_H
 
 #include <QtGui/qaccessibleobject.h>
-#include <QtGui/qaccessible2.h>
-//#include <QtQuick1/qdeclarativeview.h>
-//#include <QtQuick1/qdeclarativeitem.h>
+#include <QtGui/private/qaccessible2_p.h>
 #include <QtQml/qqmlproperty.h>
 
-//#include <private/qdeclarativeaccessible_p.h>
-
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_ACCESSIBILITY

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index db5bbad..9ef8c7a 100644 (file)
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 SUBDIRS +=  qmltooling
-#contains(QT_CONFIG, accessibility) {
-#    SUBDIRS += accessible
-#}
+contains(QT_CONFIG, accessibility) {
+    SUBDIRS += accessible
+}

diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 6cb091b..81d4fd3 100644 (file)
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -31,7 +31,7 @@ PRIVATETESTS += \
 !qtHaveModule(xmlpatterns): PRIVATETESTS -= qquickxmllistmodel
 
 QUICKTESTS =  \
-#    qquickaccessible \
+    qquickaccessible \
     qquickanchors \
     qquickanimatedimage \
     qquickanimatedsprite \