Fix QDesktopServices::openUrl when there is no windowmanager integration

Change-Id: I51da06261acfb193a59db34bc2dd25e3452fce8d
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

1 files changed, 18 insertions, 13 deletions

diff --git a/src/client/qwaylandwindowmanagerintegration.cpp b/src/client/qwaylandwindowmanagerintegration.cpp
index 56fe7c5a3..5e8a628bf 100644
--- a/src/client/qwaylandwindowmanagerintegration.cpp
+++ b/src/client/qwaylandwindowmanagerintegration.cpp
@@ -127,28 +127,33 @@ QByteArray QWaylandWindowManagerIntegration::desktopEnvironment() const
 
 void QWaylandWindowManagerIntegration::openUrl_helper(const QUrl &url)
 {
-    if (isInitialized()) {
-        QByteArray data = url.toString().toUtf8();
-
-        static const int chunkSize = 128;
-        while (!data.isEmpty()) {
-            QByteArray chunk = data.left(chunkSize);
-            data = data.mid(chunkSize);
-            open_url(!data.isEmpty(), QString::fromUtf8(chunk));
-        }
+    Q_ASSERT(isInitialized());
+    QByteArray data = url.toString().toUtf8();
+
+    static const int chunkSize = 128;
+    while (!data.isEmpty()) {
+        QByteArray chunk = data.left(chunkSize);
+        data = data.mid(chunkSize);
+        open_url(!data.isEmpty(), QString::fromUtf8(chunk));
     }
 }
 
 bool QWaylandWindowManagerIntegration::openUrl(const QUrl &url)
 {
-    openUrl_helper(url);
-    return true;
+    if (isInitialized()) {
+        openUrl_helper(url);
+        return true;
+    }
+    return QGenericUnixServices::openUrl(url);
 }
 
 bool QWaylandWindowManagerIntegration::openDocument(const QUrl &url)
 {
-    openUrl_helper(url);
-    return true;
+    if (isInitialized()) {
+        openUrl_helper(url);
+        return true;
+    }
+    return QGenericUnixServices::openDocument(url);
 }
 
 }