Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I2811ff0b9d4097f0be60ff16e9664a5060cff23e

4 files changed, 39 insertions, 25 deletions

diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
index d4454e4b9f..ba62d8a532 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
@@ -52,6 +52,7 @@
 #ifndef QT_NO_ACCESSIBILITY
 #include "socket_interface.h"
 #include "constant_mappings_p.h"
+#include "../accessibility/qaccessiblebridgeutils_p.h"
 
 #include "application_p.h"
 /*!
@@ -1486,7 +1487,7 @@ QStringList AtSpiAdaptor::accessibleInterfaces(QAccessibleInterface *interface)
     if (interface->role() == QAccessible::Application)
         ifaces << QLatin1String(ATSPI_DBUS_INTERFACE_APPLICATION);
 
-    if (interface->actionInterface())
+    if (interface->actionInterface() || interface->valueInterface())
         ifaces << QLatin1String(ATSPI_DBUS_INTERFACE_ACTION);
 
     if (interface->textInterface())
@@ -1696,36 +1697,44 @@ QRect AtSpiAdaptor::getExtents(QAccessibleInterface *interface, uint coordType)
 // Action interface
 bool AtSpiAdaptor::actionInterface(QAccessibleInterface *interface, const QString &function, const QDBusMessage &message, const QDBusConnection &connection)
 {
-    QAccessibleActionInterface *actionIface = interface->actionInterface();
-    if (!actionIface)
-        return false;
-
     if (function == QLatin1String("GetNActions")) {
-        sendReply(connection, message, QVariant::fromValue(QDBusVariant(QVariant::fromValue(actionIface->actionNames().count()))));
+        int count = QAccessibleBridgeUtils::effectiveActionNames(interface).count();
+        sendReply(connection, message, QVariant::fromValue(QDBusVariant(QVariant::fromValue(count))));
     } else if (function == QLatin1String("DoAction")) {
         int index = message.arguments().at(0).toInt();
-        if (index < 0 || index >= actionIface->actionNames().count())
+        const QStringList actionNames = QAccessibleBridgeUtils::effectiveActionNames(interface);
+        if (index < 0 || index >= actionNames.count())
             return false;
-        interface->actionInterface()->doAction(actionIface->actionNames().at(index));
-        sendReply(connection, message, true);
+        const QString actionName = actionNames.at(index);
+        bool success = QAccessibleBridgeUtils::performEffectiveAction(interface, actionName);
+        sendReply(connection, message, success);
     } else if (function == QLatin1String("GetActions")) {
-        sendReply(connection, message, QVariant::fromValue(getActions(actionIface)));
+        sendReply(connection, message, QVariant::fromValue(getActions(interface)));
     } else if (function == QLatin1String("GetName")) {
         int index = message.arguments().at(0).toInt();
-        if (index < 0 || index >= actionIface->actionNames().count())
+        const QStringList actionNames = QAccessibleBridgeUtils::effectiveActionNames(interface);
+        if (index < 0 || index >= actionNames.count())
             return false;
-        sendReply(connection, message, actionIface->actionNames().at(index));
+        sendReply(connection, message, actionNames.at(index));
     } else if (function == QLatin1String("GetDescription")) {
         int index = message.arguments().at(0).toInt();
-        if (index < 0 || index >= actionIface->actionNames().count())
+        const QStringList actionNames = QAccessibleBridgeUtils::effectiveActionNames(interface);
+        if (index < 0 || index >= actionNames.count())
             return false;
-        sendReply(connection, message, actionIface->localizedActionDescription(actionIface->actionNames().at(index)));
+        QString description;
+        if (QAccessibleActionInterface *actionIface = interface->actionInterface())
+            description = actionIface->localizedActionDescription(actionNames.at(index));
+        else
+            description = qAccessibleLocalizedActionDescription(actionNames.at(index));
+        sendReply(connection, message, description);
     } else if (function == QLatin1String("GetKeyBinding")) {
         int index = message.arguments().at(0).toInt();
-        if (index < 0 || index >= actionIface->actionNames().count())
+        const QStringList actionNames = QAccessibleBridgeUtils::effectiveActionNames(interface);
+        if (index < 0 || index >= actionNames.count())
             return false;
         QStringList keyBindings;
-        keyBindings = actionIface->keyBindingsForAction(actionIface->actionNames().value(index));
+        if (QAccessibleActionInterface *actionIface = interface->actionInterface())
+            keyBindings = actionIface->keyBindingsForAction(actionNames.at(index));
         if (keyBindings.isEmpty()) {
             QString acc = interface->text(QAccessible::Accelerator);
             if (!acc.isEmpty())
@@ -1742,20 +1751,24 @@ bool AtSpiAdaptor::actionInterface(QAccessibleInterface *interface, const QStrin
     return true;
 }
 
-QSpiActionArray AtSpiAdaptor::getActions(QAccessibleActionInterface *actionInterface) const
+QSpiActionArray AtSpiAdaptor::getActions(QAccessibleInterface *interface) const
 {
+    QAccessibleActionInterface *actionInterface = interface->actionInterface();
     QSpiActionArray actions;
-    Q_FOREACH (const QString &actionName, actionInterface->actionNames()) {
+    Q_FOREACH (const QString &actionName, QAccessibleBridgeUtils::effectiveActionNames(interface)) {
         QSpiAction action;
         QStringList keyBindings;
 
         action.name = actionName;
-        action.description = actionInterface->localizedActionDescription(actionName);
-
-        keyBindings = actionInterface->keyBindingsForAction(actionName);
+        if (actionInterface) {
+            action.description = actionInterface->localizedActionDescription(actionName);
+            keyBindings = actionInterface->keyBindingsForAction(actionName);
+        } else {
+            action.description = qAccessibleLocalizedActionDescription(actionName);
+        }
 
         if (keyBindings.length() > 0)
-                action.keyBinding = keyBindings[0];
+            action.keyBinding = keyBindings[0];
         else
             action.keyBinding = QString();
 
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
index d3cd510153..410742b6b6 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
@@ -122,7 +122,7 @@ private:
     static QRect translateRectToWindowCoordinates(QAccessibleInterface *interface, const QRect &rect);
 
     // action helper functions
-    QSpiActionArray getActions(QAccessibleActionInterface* interface) const;
+    QSpiActionArray getActions(QAccessibleInterface *interface) const;
 
     // text helper functions
     QVariantList getAttributes(QAccessibleInterface *, int offset, bool includeDefaults) const;
diff --git a/src/platformsupport/linuxaccessibility/bridge.cpp b/src/platformsupport/linuxaccessibility/bridge.cpp
index 3665b9cefe..25451b1d62 100644
--- a/src/platformsupport/linuxaccessibility/bridge.cpp
+++ b/src/platformsupport/linuxaccessibility/bridge.cpp
@@ -136,8 +136,8 @@ static RoleMapping map[] = {
     { QAccessible::Caret, ATSPI_ROLE_UNKNOWN, QT_TRANSLATE_NOOP("QSpiAccessibleBridge", "text caret") },
     //: Role of an accessible object
     { QAccessible::AlertMessage, ATSPI_ROLE_ALERT, QT_TRANSLATE_NOOP("QSpiAccessibleBridge", "alert message") },
-    //: Role of an accessible object
-    { QAccessible::Window, ATSPI_ROLE_WINDOW, QT_TRANSLATE_NOOP("QSpiAccessibleBridge", "window") },
+    //: Role of an accessible object: a window with frame and title
+    { QAccessible::Window, ATSPI_ROLE_FRAME, QT_TRANSLATE_NOOP("QSpiAccessibleBridge", "frame") },
     //: Role of an accessible object
     { QAccessible::Client, ATSPI_ROLE_FILLER, QT_TRANSLATE_NOOP("QSpiAccessibleBridge", "filler") },
     //: Role of an accessible object
diff --git a/src/platformsupport/linuxaccessibility/linuxaccessibility.pri b/src/platformsupport/linuxaccessibility/linuxaccessibility.pri
index 1b65fb1cad..1d51d2876c 100644
--- a/src/platformsupport/linuxaccessibility/linuxaccessibility.pri
+++ b/src/platformsupport/linuxaccessibility/linuxaccessibility.pri
@@ -2,6 +2,7 @@ contains(QT_CONFIG, accessibility-atspi-bridge) {
 
     QT_FOR_PRIVATE += dbus
     include(../../3rdparty/atspi2/atspi2.pri)
+    include(../accessibility/accessibility.pri)
 
     INCLUDEPATH += $$PWD