diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-24 17:20:15 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 14:55:19 +0200 |
| commit | b449791c3565940e701c68b3f705014804af0c2b (patch) | |
| tree | 89700eecb284d63e659499dea428c47254b04a2f /src/widgets/accessible | |
| parent | 580d816bb855b9e9c0f3aec2863f7324e5849ab5 (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/widgets/accessible')
| -rw-r--r-- | src/widgets/accessible/accessible.pri | 2 | ||||
| -rw-r--r-- | src/widgets/accessible/qaccessiblewidget.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/accessible/qaccessiblewidget.h (renamed from src/widgets/accessible/qaccessiblewidget_p.h) | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/widgets/accessible/accessible.pri b/src/widgets/accessible/accessible.pri index 84d366e78a..9fb2f18950 100644 --- a/src/widgets/accessible/accessible.pri +++ b/src/widgets/accessible/accessible.pri @@ -1,6 +1,6 @@ # Qt accessibility module contains(QT_CONFIG, accessibility) { - HEADERS += accessible/qaccessiblewidget_p.h + HEADERS += accessible/qaccessiblewidget.h SOURCES += accessible/qaccessiblewidget.cpp } diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index dcbf276356..7b32cae54f 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qaccessiblewidget_p.h" +#include "qaccessiblewidget.h" #ifndef QT_NO_ACCESSIBILITY @@ -169,7 +169,6 @@ public: /*! \class QAccessibleWidget \brief The QAccessibleWidget class implements the QAccessibleInterface for QWidgets. - \internal \ingroup accessibility \inmodule QtWidgets @@ -204,6 +203,7 @@ QAccessibleWidget::QAccessibleWidget(QWidget *w, QAccessible::Role role, const Q d->name = name; } +/*! \reimp */ bool QAccessibleWidget::isValid() const { if (!object() || static_cast<QWidget *>(object())->d_func()->data.in_destructor) diff --git a/src/widgets/accessible/qaccessiblewidget_p.h b/src/widgets/accessible/qaccessiblewidget.h index cb1ce37734..5e983eee56 100644 --- a/src/widgets/accessible/qaccessiblewidget_p.h +++ b/src/widgets/accessible/qaccessiblewidget.h @@ -43,7 +43,6 @@ #define QACCESSIBLEWIDGET_H #include <QtGui/qaccessibleobject.h> -#include <QtGui/private/qaccessible2_p.h> QT_BEGIN_NAMESPACE |