1 files changed, 27 insertions, 11 deletions
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
index 47ac54927b..16c0ebfe21 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
@@ -712,19 +712,35 @@ void QIBusPlatformInputContextPrivate::createBusProxy()
 
 QString QIBusPlatformInputContextPrivate::getSocketPath()
 {
-    QByteArray display(qgetenv("DISPLAY"));
-    QByteArray host = "unix";
+    QByteArray display;
     QByteArray displayNumber = "0";
+    bool isWayland = false;
+
+    if (qEnvironmentVariableIsSet("IBUS_ADDRESS_FILE")) {
+        QByteArray path = qgetenv("IBUS_ADDRESS_FILE");
+        return QString::fromLocal8Bit(path);
+    } else  if (qEnvironmentVariableIsSet("WAYLAND_DISPLAY")) {
+        display = qgetenv("WAYLAND_DISPLAY");
+        isWayland = true;
+    } else {
+        display = qgetenv("DISPLAY");
+    }
+    QByteArray host = "unix";
+
+    if (isWayland) {
+        displayNumber = display;
+    } else {
+        int pos = display.indexOf(':');
+        if (pos > 0)
+            host = display.left(pos);
+        ++pos;
+        int pos2 = display.indexOf('.', pos);
+        if (pos2 > 0)
+            displayNumber = display.mid(pos, pos2 - pos);
+         else
+            displayNumber = display.mid(pos);
+    }
 
-    int pos = display.indexOf(':');
-    if (pos > 0)
-        host = display.left(pos);
-    ++pos;
-    int pos2 = display.indexOf('.', pos);
-    if (pos2 > 0)
-        displayNumber = display.mid(pos, pos2 - pos);
-    else
-        displayNumber = display.mid(pos);
     if (debug)
         qDebug() << "host=" << host << "displayNumber" << displayNumber;