3 files changed, 15 insertions, 1 deletions
diff --git a/src/platformsupport/linuxaccessibility/bridge.cpp b/src/platformsupport/linuxaccessibility/bridge.cpp
index 9b02d44aa5..a96fe258df 100644
--- a/src/platformsupport/linuxaccessibility/bridge.cpp
+++ b/src/platformsupport/linuxaccessibility/bridge.cpp
@@ -261,6 +261,10 @@ static RoleMapping map[] = {
     //: Role of an accessible object
     { QAccessible::ComplementaryContent, ATSPI_ROLE_SECTION, QT_TRANSLATE_NOOP("QSpiAccessibleBridge", "complementary content") },
     //: Role of an accessible object
+    { QAccessible::Terminal, ATSPI_ROLE_TERMINAL, QT_TRANSLATE_NOOP("QSpiAccessibleBridge", "terminal") },
+    //: Role of an accessible object
+    { QAccessible::Desktop, ATSPI_ROLE_DESKTOP_FRAME, QT_TRANSLATE_NOOP("QSpiAccessibleBridge", "desktop") },
+    //: Role of an accessible object
     { QAccessible::UserRole, ATSPI_ROLE_UNKNOWN, QT_TRANSLATE_NOOP("QSpiAccessibleBridge", "unknown") }
 };
 
@@ -268,6 +272,12 @@ void QSpiAccessibleBridge::initializeConstantMappings()
 {
     for (uint i = 0; i < sizeof(map) / sizeof(RoleMapping); ++i)
         qSpiRoleMapping.insert(map[i].role, RoleNames(map[i].spiRole, QLatin1String(map[i].name), tr(map[i].name)));
+
+    // -1 because we have button duplicated, as PushButton and Button.
+    Q_ASSERT_X(qSpiRoleMapping.size() ==
+               QAccessible::staticMetaObject.enumerator(
+                   QAccessible::staticMetaObject.indexOfEnumerator("Role")).keyCount() - 1,
+               "", "Handle all QAccessible::Role members in qSpiRoleMapping");
 }
 
 QT_END_NAMESPACE
diff --git a/src/platformsupport/linuxaccessibility/constant_mappings.cpp b/src/platformsupport/linuxaccessibility/constant_mappings.cpp
index ef2b3429d2..fce2919e73 100644
--- a/src/platformsupport/linuxaccessibility/constant_mappings.cpp
+++ b/src/platformsupport/linuxaccessibility/constant_mappings.cpp
@@ -79,7 +79,7 @@ quint64 spiStatesFromQState(QAccessible::State state)
     if (state.checkStateMixed)
         setSpiStateBit(&spiState, ATSPI_STATE_INDETERMINATE);
     if (state.readOnly)
-        unsetSpiStateBit(&spiState, ATSPI_STATE_EDITABLE);
+        setSpiStateBit(&spiState, ATSPI_STATE_READ_ONLY);
     //        if (state.HotTracked)
     if (state.defaultButton)
         setSpiStateBit(&spiState, ATSPI_STATE_IS_DEFAULT);
diff --git a/src/platformsupport/linuxaccessibility/dbusconnection.cpp b/src/platformsupport/linuxaccessibility/dbusconnection.cpp
index 3e2248a018..cacbfdae9f 100644
--- a/src/platformsupport/linuxaccessibility/dbusconnection.cpp
+++ b/src/platformsupport/linuxaccessibility/dbusconnection.cpp
@@ -71,6 +71,10 @@ DBusConnection::DBusConnection(QObject *parent)
 {
     // Start monitoring if "org.a11y.Bus" is registered as DBus service.
     QDBusConnection c = QDBusConnection::sessionBus();
+    if (!c.isConnected()) {
+        return;
+    }
+
     dbusWatcher = new QDBusServiceWatcher(A11Y_SERVICE, c, QDBusServiceWatcher::WatchForRegistration, this);
     connect(dbusWatcher, SIGNAL(serviceRegistered(QString)), this, SLOT(serviceRegistered()));