3 files changed, 33 insertions, 2 deletions
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
index c040dab5e1..47c37ba6dc 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
@@ -1431,7 +1431,9 @@ bool AtSpiAdaptor::accessibleInterface(QAccessibleInterface *interface, const QS
                       QSpiObjectReference(connection, QDBusObjectPath(QSPI_OBJECT_PATH_ROOT))));
     } else if (function == QLatin1String("GetChildren")) {
         QSpiObjectReferenceArray children;
-        for (int i = 0; i < interface->childCount(); ++i) {
+        const int numChildren = interface->childCount();
+        children.reserve(numChildren);
+        for (int i = 0; i < numChildren; ++i) {
             QString childPath = pathForInterface(interface->child(i));
             QSpiObjectReference ref(connection, QDBusObjectPath(childPath));
             children << ref;
@@ -1747,7 +1749,9 @@ QSpiActionArray AtSpiAdaptor::getActions(QAccessibleInterface *interface) const
 {
     QAccessibleActionInterface *actionInterface = interface->actionInterface();
     QSpiActionArray actions;
-    Q_FOREACH (const QString &actionName, QAccessibleBridgeUtils::effectiveActionNames(interface)) {
+    const QStringList actionNames = QAccessibleBridgeUtils::effectiveActionNames(interface);
+    actions.reserve(actionNames.size());
+    Q_FOREACH (const QString &actionName, actionNames) {
         QSpiAction action;
         QStringList keyBindings;
 
diff --git a/src/platformsupport/linuxaccessibility/dbusconnection.cpp b/src/platformsupport/linuxaccessibility/dbusconnection.cpp
index 45729fa065..637b06549a 100644
--- a/src/platformsupport/linuxaccessibility/dbusconnection.cpp
+++ b/src/platformsupport/linuxaccessibility/dbusconnection.cpp
@@ -42,6 +42,9 @@
 #include <QDBusConnectionInterface>
 #include "bus_interface.h"
 
+#include <QtGui/qguiapplication.h>
+#include <qplatformnativeinterface.h>
+
 QT_BEGIN_NAMESPACE
 
 QString A11Y_SERVICE = QStringLiteral("org.a11y.Bus");
@@ -65,6 +68,29 @@ DBusConnection::DBusConnection(QObject *parent)
     // If it is registered already, setup a11y right away
     if (c.interface()->isServiceRegistered(A11Y_SERVICE))
         serviceRegistered();
+
+    // In addition try if there is an xatom exposing the bus address, this allows applications run as root to work
+    QString address = getAddressFromXCB();
+    if (!address.isEmpty()) {
+        m_enabled = true;
+        connectA11yBus(address);
+    }
+}
+
+QString DBusConnection::getAddressFromXCB()
+{
+    QGuiApplication *app = qobject_cast<QGuiApplication *>(QCoreApplication::instance());
+    if (!app)
+        return QString();
+    QPlatformNativeInterface *platformNativeInterface = app->platformNativeInterface();
+    QByteArray *addressByteArray = reinterpret_cast<QByteArray*>(
+                platformNativeInterface->nativeResourceForIntegration(QByteArrayLiteral("AtspiBus")));
+    if (addressByteArray) {
+        QString address = QString::fromLatin1(*addressByteArray);
+        delete addressByteArray;
+        return address;
+    }
+    return QString();
 }
 
 // We have the a11y registry on the session bus.
diff --git a/src/platformsupport/linuxaccessibility/dbusconnection_p.h b/src/platformsupport/linuxaccessibility/dbusconnection_p.h
index a0bd6450bf..30707a3f95 100644
--- a/src/platformsupport/linuxaccessibility/dbusconnection_p.h
+++ b/src/platformsupport/linuxaccessibility/dbusconnection_p.h
@@ -68,6 +68,7 @@ Q_SIGNALS:
     void enabledChanged(bool enabled);
 
 private Q_SLOTS:
+    QString getAddressFromXCB();
     void serviceRegistered();
     void serviceUnregistered();
     void connectA11yBus(const QString &address);