From f799e57151dbd236f30d4ffb20d6c331b6e1a388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Mill=C3=A1n=20Soto?= Date: Tue, 11 Sep 2012 13:22:35 +0200 Subject: 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 Reviewed-by: Frederik Gladhorn --- src/platformsupport/linuxaccessibility/bridge.cpp | 6 ++---- 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; -- cgit v1.2.3