diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 15:21:32 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-11 16:53:31 +0100 |
| commit | be2954a0b7d26942f7b6fcf4d4c45e7c6164872c (patch) | |
| tree | dcbdfb6a542c86488401542a04a08b608e832318 /src/quick/accessible/qaccessiblequickitem_p.h | |
| parent | e552ca0602186826b9dbf2435dd95303cf1bf39b (diff) | |
Merge QQmlAccessible into QAccessibleQuickItem
The idea of the separation was to keep Qt Quick 1 and 2 accessibilty in
sync. This is not going to happen because Qt Quick 1 accessibility was
never supported and will not be in the future either, so instead remove
code duplication and merge the two classes.
Change-Id: I508eb0ae20ab22ee92806a4c648c39b35259b6b9
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'src/quick/accessible/qaccessiblequickitem_p.h')
| -rw-r--r-- | src/quick/accessible/qaccessiblequickitem_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/accessible/qaccessiblequickitem_p.h b/src/quick/accessible/qaccessiblequickitem_p.h index e8486721f3..5525e60493 100644 --- a/src/quick/accessible/qaccessiblequickitem_p.h +++ b/src/quick/accessible/qaccessiblequickitem_p.h @@ -36,7 +36,7 @@ #include <QtQuick/QQuickItem> #include <QtQuick/QQuickView> -#include <QtQuick/private/qqmlaccessible_p.h> +#include <QtGui/qaccessibleobject.h> QT_BEGIN_NAMESPACE @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE class QTextDocument; -class QAccessibleQuickItem : public QQmlAccessible, public QAccessibleValueInterface, public QAccessibleTextInterface +class QAccessibleQuickItem : public QAccessibleObject, public QAccessibleActionInterface, public QAccessibleValueInterface, public QAccessibleTextInterface { public: QAccessibleQuickItem(QQuickItem *item); |