1 files changed, 45 insertions, 32 deletions

diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index e935ef31f..1ffaf3c89 100644
--- a/src/client/qwaylandintegration.cpp
+++ b/src/client/qwaylandintegration.cpp
@@ -86,6 +86,10 @@
 #include "qwaylandinputdeviceintegration_p.h"
 #include "qwaylandinputdeviceintegrationfactory_p.h"
 
+#ifndef QT_NO_ACCESSIBILITY_ATSPI_BRIDGE
+#include <QtLinuxAccessibilitySupport/private/bridge_p.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 namespace QtWaylandClient {
@@ -129,9 +133,6 @@ QWaylandIntegration::QWaylandIntegration()
     : mFontDb(new QGenericUnixFontDatabase())
 #endif
     , mNativeInterface(new QWaylandNativeInterface(this))
-#if QT_CONFIG(accessibility)
-    , mAccessibility(new QPlatformAccessibility())
-#endif
 {
     initializeInputDeviceIntegration();
     mDisplay.reset(new QWaylandDisplay(this));
@@ -277,6 +278,15 @@ QVariant QWaylandIntegration::styleHint(StyleHint hint) const
 #if QT_CONFIG(accessibility)
 QPlatformAccessibility *QWaylandIntegration::accessibility() const
 {
+    if (!mAccessibility) {
+#ifndef QT_NO_ACCESSIBILITY_ATSPI_BRIDGE
+        Q_ASSERT_X(QCoreApplication::eventDispatcher(), "QXcbIntegration",
+            "Initializing accessibility without event-dispatcher!");
+        mAccessibility.reset(new QSpiAccessibleBridge());
+#else
+        mAccessibility.reset(new QPlatformAccessibility());
+#endif
+    }
     return mAccessibility.data();
 }
 #endif
@@ -329,16 +339,15 @@ void QWaylandIntegration::initializeClientBufferIntegration()
 {
     mClientBufferIntegrationInitialized = true;
 
-    QString targetKey;
-    bool disableHardwareIntegration = qEnvironmentVariableIsSet("QT_WAYLAND_DISABLE_HW_INTEGRATION");
-    disableHardwareIntegration = disableHardwareIntegration || !mDisplay->hardwareIntegration();
-    if (disableHardwareIntegration) {
-        QByteArray clientBufferIntegrationName = qgetenv("QT_WAYLAND_CLIENT_BUFFER_INTEGRATION");
-        if (clientBufferIntegrationName.isEmpty())
-            clientBufferIntegrationName = QByteArrayLiteral("wayland-egl");
-        targetKey = QString::fromLocal8Bit(clientBufferIntegrationName);
-    } else {
-        targetKey = mDisplay->hardwareIntegration()->clientBufferIntegration();
+    QString targetKey = QString::fromLocal8Bit(qgetenv("QT_WAYLAND_CLIENT_BUFFER_INTEGRATION"));
+
+    if (targetKey.isEmpty()) {
+        if (mDisplay->hardwareIntegration()
+                && mDisplay->hardwareIntegration()->clientBufferIntegration() != QLatin1String("linux-dmabuf-unstable-v1")) {
+            targetKey = mDisplay->hardwareIntegration()->clientBufferIntegration();
+        } else {
+            targetKey = QLatin1Literal("wayland-egl");
+        }
     }
 
     if (targetKey.isEmpty()) {
@@ -347,29 +356,28 @@ void QWaylandIntegration::initializeClientBufferIntegration()
     }
 
     QStringList keys = QWaylandClientBufferIntegrationFactory::keys();
-    if (keys.contains(targetKey)) {
+    qCDebug(lcQpaWayland) << "Available client buffer integrations:" << keys;
+
+    if (keys.contains(targetKey))
         mClientBufferIntegration.reset(QWaylandClientBufferIntegrationFactory::create(targetKey, QStringList()));
-    }
-    if (mClientBufferIntegration)
+
+    if (mClientBufferIntegration) {
+        qCDebug(lcQpaWayland) << "Initializing client buffer integration" << targetKey;
         mClientBufferIntegration->initialize(mDisplay.data());
-    else
-        qWarning("Failed to load client buffer integration: %s\n", qPrintable(targetKey));
+    } else {
+        qCWarning(lcQpaWayland) << "Failed to load client buffer integration:" << targetKey;
+        qCWarning(lcQpaWayland) << "Available client buffer integrations:" << keys;
+    }
 }
 
 void QWaylandIntegration::initializeServerBufferIntegration()
 {
     mServerBufferIntegrationInitialized = true;
 
-    QString targetKey;
+    QString targetKey = QString::fromLocal8Bit(qgetenv("QT_WAYLAND_SERVER_BUFFER_INTEGRATION"));
 
-    bool disableHardwareIntegration = qEnvironmentVariableIsSet("QT_WAYLAND_DISABLE_HW_INTEGRATION");
-    disableHardwareIntegration = disableHardwareIntegration || !mDisplay->hardwareIntegration();
-    if (disableHardwareIntegration) {
-        QByteArray serverBufferIntegrationName = qgetenv("QT_WAYLAND_SERVER_BUFFER_INTEGRATION");
-        targetKey = QString::fromLocal8Bit(serverBufferIntegrationName);
-    } else {
+    if (targetKey.isEmpty() && mDisplay->hardwareIntegration())
         targetKey = mDisplay->hardwareIntegration()->serverBufferIntegration();
-    }
 
     if (targetKey.isEmpty()) {
         qWarning("Failed to determine what server buffer integration to use");
@@ -377,13 +385,18 @@ void QWaylandIntegration::initializeServerBufferIntegration()
     }
 
     QStringList keys = QWaylandServerBufferIntegrationFactory::keys();
-    if (keys.contains(targetKey)) {
+    qCDebug(lcQpaWayland) << "Available server buffer integrations:" << keys;
+
+    if (keys.contains(targetKey))
         mServerBufferIntegration.reset(QWaylandServerBufferIntegrationFactory::create(targetKey, QStringList()));
-    }
-    if (mServerBufferIntegration)
+
+    if (mServerBufferIntegration) {
+        qCDebug(lcQpaWayland) << "Initializing server buffer integration" << targetKey;
         mServerBufferIntegration->initialize(mDisplay.data());
-    else
-        qWarning("Failed to load server buffer integration %s\n", qPrintable(targetKey));
+    } else {
+        qCWarning(lcQpaWayland) << "Failed to load server buffer integration: " <<  targetKey;
+        qCWarning(lcQpaWayland) << "Available server buffer integrations:" << keys;
+    }
 }
 
 void QWaylandIntegration::initializeShellIntegration()
@@ -411,7 +424,7 @@ void QWaylandIntegration::initializeShellIntegration()
     Q_FOREACH (QString preferredShell, preferredShells) {
         mShellIntegration.reset(createShellIntegration(preferredShell));
         if (mShellIntegration) {
-            qDebug("Using the '%s' shell integration", qPrintable(preferredShell));
+            qCDebug(lcQpaWayland, "Using the '%s' shell integration", qPrintable(preferredShell));
             break;
         }
     }