1 files changed, 49 insertions, 16 deletions

diff --git a/src/gui/platform/unix/qgenericunixservices.cpp b/src/gui/platform/unix/qgenericunixservices.cpp
index 1563b38d54..bfd2556b1e 100644
--- a/src/gui/platform/unix/qgenericunixservices.cpp
+++ b/src/gui/platform/unix/qgenericunixservices.cpp
@@ -162,7 +162,7 @@ static inline bool launch(const QString &launcher, const QUrl &url,
 #if QT_CONFIG(dbus)
 static inline bool checkNeedPortalSupport()
 {
-    return !QStandardPaths::locate(QStandardPaths::RuntimeLocation, "flatpak-info"_L1).isEmpty() || qEnvironmentVariableIsSet("SNAP");
+    return QFileInfo::exists("/.flatpak-info"_L1) || qEnvironmentVariableIsSet("SNAP");
 }
 
 static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url, const QString &parentWindow,
@@ -177,8 +177,7 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url, const QStri
     // handle_token (s) -  A string that will be used as the last element of the @handle.
     // writable (b) - Whether to allow the chosen application to write to the file.
 
-#ifdef O_PATH
-    const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_PATH);
+    const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_RDONLY);
     if (fd != -1) {
         QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.portal.Desktop"_L1,
                                                               "/org/freedesktop/portal/desktop"_L1,
@@ -188,7 +187,7 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url, const QStri
         QDBusUnixFileDescriptor descriptor;
         descriptor.giveFileDescriptor(fd);
 
-        QVariantMap options = { { "writable"_L1, true } };
+        QVariantMap options = {};
 
         if (!xdgActivationToken.isEmpty()) {
             options.insert("activation_token"_L1, xdgActivationToken);
@@ -198,11 +197,6 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url, const QStri
 
         return QDBusConnection::sessionBus().call(message);
     }
-#else
-    Q_UNUSED(url);
-    Q_UNUSED(parentWindow)
-    Q_UNUSED(xdgActivationToken)
-#endif
 
     return QDBusMessage::createError(QDBusError::InternalError, qt_error_string());
 }
@@ -360,9 +354,13 @@ private Q_SLOTS:
     {
         if (result != 0)
             return;
-        XDGDesktopColor color{};
-        map.value(u"color"_s).value<QDBusArgument>() >> color;
-        Q_EMIT colorPicked(color.toQColor());
+        if (map.contains(u"color"_s)) {
+            XDGDesktopColor color{};
+            map.value(u"color"_s).value<QDBusArgument>() >> color;
+            Q_EMIT colorPicked(color.toQColor());
+        } else {
+            Q_EMIT colorPicked({});
+        }
         deleteLater();
     }
 
@@ -424,9 +422,11 @@ QByteArray QGenericUnixServices::desktopEnvironment() const
 template<typename F>
 void runWithXdgActivationToken(F &&functionToCall)
 {
+#if QT_CONFIG(wayland)
     QWindow *window = qGuiApp->focusWindow();
 
     if (!window) {
+        functionToCall({});
         return;
     }
 
@@ -436,13 +436,17 @@ void runWithXdgActivationToken(F &&functionToCall)
             dynamic_cast<QNativeInterface::Private::QWaylandWindow *>(window->handle());
 
     if (!waylandWindow || !waylandApp) {
+        functionToCall({});
         return;
     }
 
-    waylandWindow->requestXdgActivationToken(waylandApp->lastInputSerial());
     QObject::connect(waylandWindow,
                      &QNativeInterface::Private::QWaylandWindow::xdgActivationTokenCreated,
                      waylandWindow, functionToCall, Qt::SingleShotConnection);
+    waylandWindow->requestXdgActivationToken(waylandApp->lastInputSerial());
+#else
+    functionToCall({});
+#endif
 }
 
 bool QGenericUnixServices::openUrl(const QUrl &url)
@@ -560,9 +564,7 @@ QPlatformServiceColorPicker *QGenericUnixServices::colorPicker(QWindow *parent)
 
 QString QGenericUnixServices::portalWindowIdentifier(QWindow *window)
 {
-    if (QGuiApplication::platformName() == QLatin1String("xcb"))
-        return "x11:"_L1 + QString::number(window->winId(), 16);
-
+    Q_UNUSED(window);
     return QString();
 }
 
@@ -575,6 +577,37 @@ bool QGenericUnixServices::hasCapability(Capability capability) const
     return false;
 }
 
+void QGenericUnixServices::setApplicationBadge(qint64 number)
+{
+#if QT_CONFIG(dbus)
+    if (qGuiApp->desktopFileName().isEmpty()) {
+        qWarning("QGuiApplication::desktopFileName() is empty");
+        return;
+    }
+
+
+    const QString launcherUrl = QStringLiteral("application://") + qGuiApp->desktopFileName() + QStringLiteral(".desktop");
+    const qint64 count = qBound(0, number, 9999);
+    QVariantMap dbusUnityProperties;
+
+    if (count > 0) {
+        dbusUnityProperties[QStringLiteral("count")] = count;
+        dbusUnityProperties[QStringLiteral("count-visible")] = true;
+    } else {
+        dbusUnityProperties[QStringLiteral("count-visible")] = false;
+    }
+
+    auto signal = QDBusMessage::createSignal(QStringLiteral("/com/canonical/unity/launcherentry/")
+        + qGuiApp->applicationName(), QStringLiteral("com.canonical.Unity.LauncherEntry"), QStringLiteral("Update"));
+
+    signal.setArguments({launcherUrl, dbusUnityProperties});
+
+    QDBusConnection::sessionBus().send(signal);
+#else
+    Q_UNUSED(number)
+#endif
+}
+
 QT_END_NAMESPACE
 
 #include "qgenericunixservices.moc"