diff options
| -rw-r--r-- | src/plugins/accessible/quick/qaccessiblequickview.h | 2 | ||||
| -rw-r--r-- | src/plugins/accessible/shared/qqmlaccessible.h | 6 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 6 | ||||
| -rw-r--r-- | tests/auto/quick/quick.pro | 2 |
4 files changed, 6 insertions, 10 deletions
diff --git a/src/plugins/accessible/quick/qaccessiblequickview.h b/src/plugins/accessible/quick/qaccessiblequickview.h index b8c02cb109..3bfc4ab4fd 100644 --- 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 5eb8c3adce..c6ac4e49dd 100644 --- 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 db5bbad7f8..9ef8c7ab72 100644 --- 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 6cb091b04a..81d4fd3348 100644 --- 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 \ |