diff options
author | José Millán Soto <fid@gpul.org> | 2012-09-11 13:22:35 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-22 19:03:16 +0200 |
commit | f799e57151dbd236f30d4ffb20d6c331b6e1a388 (patch) | |
tree | c263135c4efb66644253402d2fe320f49e86b3db /src | |
parent | 3e78f84f4e59f417e2837b6eeeaff0b14f85309e (diff) |
Correct QSpiAccessibleBridge::setRootObject definition
QSpiAccessibleBridge::setRootObject was defined to require a
QAccessibleInterface* as parameter instead of QObject*, as a result of
that, QSpiAccessibleBridge::setRootObject did not reimplement
QPlatformAccessibility::setRootObject and the adaptor was not initialized.
After this change, applications should work with screen readers.
Change-Id: Iee3d39f8e0959c1d75b1e682847d266a723c141b
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/platformsupport/linuxaccessibility/bridge.cpp | 6 | ||||
-rw-r--r-- | src/platformsupport/linuxaccessibility/bridge_p.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/platformsupport/linuxaccessibility/bridge.cpp b/src/platformsupport/linuxaccessibility/bridge.cpp index 1db5d26e2a..208e618dd8 100644 --- a/src/platformsupport/linuxaccessibility/bridge.cpp +++ b/src/platformsupport/linuxaccessibility/bridge.cpp @@ -93,11 +93,9 @@ QDBusConnection QSpiAccessibleBridge::dBusConnection() const return dbusConnection->connection(); } -void QSpiAccessibleBridge::setRootObject(QAccessibleInterface *interface) +void QSpiAccessibleBridge::setRootObject(QObject *obj) { - // the interface we get will be for the QApplication object. - // we already cache it in the constructor. - Q_ASSERT(interface->object() == qApp); + Q_UNUSED(obj); dbusAdaptor->setInitialized(true); } diff --git a/src/platformsupport/linuxaccessibility/bridge_p.h b/src/platformsupport/linuxaccessibility/bridge_p.h index 4a77fa7984..64eeeff612 100644 --- a/src/platformsupport/linuxaccessibility/bridge_p.h +++ b/src/platformsupport/linuxaccessibility/bridge_p.h @@ -62,7 +62,7 @@ public: QSpiAccessibleBridge(); virtual ~QSpiAccessibleBridge(); - virtual void setRootObject(QAccessibleInterface *obj); + virtual void setRootObject(QObject *obj); virtual void notifyAccessibilityUpdate(QAccessibleEvent *event); QDBusConnection dBusConnection() const; |