diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-12 13:38:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-22 18:29:40 +0100 |
| commit | 583bd0073942c9ac017f865057c003c11992b09a (patch) | |
| tree | 1539fd117512375958ce675cc8a5bea989096c33 /src/plugins | |
| parent | 4390f9322e2601b0219c984168fe7b4ec340a498 (diff) | |
Enable accessibility again.
Revert "Disable accessibility temporarily."
This reverts commit 361015dc73b887026e1937da09c11df89acf5c85.
Change-Id: Ie1d053fe64ee79fbd9e57bf2d0d2764bb638db72
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/plugins')
| -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 |
3 files changed, 5 insertions, 9 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 +} |