Move UNIX services into QtGui

Task-number: QTBUG-83255
Change-Id: I95cd25c6e18ffb46955acc76d6cab551d1c8f5ae
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

8 files changed, 0 insertions, 505 deletions

diff --git a/src/platformsupport/.prev_CMakeLists.txt b/src/platformsupport/.prev_CMakeLists.txt
index a435067b73..157a53aeca 100644
--- a/src/platformsupport/.prev_CMakeLists.txt
+++ b/src/platformsupport/.prev_CMakeLists.txt
@@ -10,9 +10,6 @@ endif()
 if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon)
     add_subdirectory(input)
 endif()
-if(QT_FEATURE_xcb OR (UNIX AND NOT UIKIT))
-    add_subdirectory(services)
-endif()
 if(QT_FEATURE_egl)
     add_subdirectory(eglconvenience)
 endif()
diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt
index 5318c26cf3..3d2586e7f1 100644
--- a/src/platformsupport/CMakeLists.txt
+++ b/src/platformsupport/CMakeLists.txt
@@ -14,9 +14,6 @@ endif()
 if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon)
     add_subdirectory(input)
 endif()
-if(QT_FEATURE_xcb OR (UNIX AND NOT UIKIT))
-    add_subdirectory(services)
-endif()
 if(QT_FEATURE_egl)
     add_subdirectory(eglconvenience)
 endif()
diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
index e54fb96dbe..406c21d6bd 100644
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@@ -14,9 +14,6 @@ qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConf
     input.depends += devicediscovery
 }
 
-if(unix:!uikit)|qtConfig(xcb): \
-    SUBDIRS += services
-
 qtConfig(egl): \
     SUBDIRS += eglconvenience
 qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2): \
diff --git a/src/platformsupport/services/CMakeLists.txt b/src/platformsupport/services/CMakeLists.txt
deleted file mode 100644
index 602dd40305..0000000000
--- a/src/platformsupport/services/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Generated from services.pro.
-
-#####################################################################
-## ServiceSupport Module:
-#####################################################################
-
-qt_add_module(ServiceSupport
-    STATIC
-    INTERNAL_MODULE
-    SOURCES
-        genericunix/qgenericunixservices.cpp genericunix/qgenericunixservices_p.h
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-    PRECOMPILED_HEADER
-        "../../corelib/global/qt_pch.h"
-)
-
-#### Keys ignored in scope 1:.:.:services.pro:<TRUE>:
-# MODULE = "service_support"
-
-## Scopes:
-#####################################################################
-
-qt_extend_target(ServiceSupport CONDITION QT_FEATURE_dbus
-    PUBLIC_LIBRARIES
-        Qt::DBus
-)
diff --git a/src/platformsupport/services/genericunix/genericunix.pri b/src/platformsupport/services/genericunix/genericunix.pri
deleted file mode 100644
index 6afafa31d0..0000000000
--- a/src/platformsupport/services/genericunix/genericunix.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-HEADERS += $$PWD/qgenericunixservices_p.h
-SOURCES += $$PWD/qgenericunixservices.cpp
diff --git a/src/platformsupport/services/genericunix/qgenericunixservices.cpp b/src/platformsupport/services/genericunix/qgenericunixservices.cpp
deleted file mode 100644
index 10d5468b9a..0000000000
--- a/src/platformsupport/services/genericunix/qgenericunixservices.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qgenericunixservices_p.h"
-#include <QtGui/private/qtguiglobal_p.h>
-
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#if QT_CONFIG(process)
-# include <QtCore/QProcess>
-#endif
-#if QT_CONFIG(settings)
-#include <QtCore/QSettings>
-#endif
-#include <QtCore/QStandardPaths>
-#include <QtCore/QUrl>
-
-#if QT_CONFIG(dbus)
-// These QtCore includes are needed for xdg-desktop-portal support
-#include <QtCore/private/qcore_unix_p.h>
-
-#include <QtCore/QFileInfo>
-#include <QtCore/QUrlQuery>
-
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusPendingCall>
-#include <QtDBus/QDBusPendingCallWatcher>
-#include <QtDBus/QDBusPendingReply>
-#include <QtDBus/QDBusUnixFileDescriptor>
-
-#include <fcntl.h>
-
-#endif // QT_CONFIG(dbus)
-
-#include <stdlib.h>
-
-QT_BEGIN_NAMESPACE
-
-#if QT_CONFIG(multiprocess)
-
-enum { debug = 0 };
-
-static inline QByteArray detectDesktopEnvironment()
-{
-    const QByteArray xdgCurrentDesktop = qgetenv("XDG_CURRENT_DESKTOP");
-    if (!xdgCurrentDesktop.isEmpty())
-        return xdgCurrentDesktop.toUpper(); // KDE, GNOME, UNITY, LXDE, MATE, XFCE...
-
-    // Classic fallbacks
-    if (!qEnvironmentVariableIsEmpty("KDE_FULL_SESSION"))
-        return QByteArrayLiteral("KDE");
-    if (!qEnvironmentVariableIsEmpty("GNOME_DESKTOP_SESSION_ID"))
-        return QByteArrayLiteral("GNOME");
-
-    // Fallback to checking $DESKTOP_SESSION (unreliable)
-    QByteArray desktopSession = qgetenv("DESKTOP_SESSION");
-
-    // This can be a path in /usr/share/xsessions
-    int slash = desktopSession.lastIndexOf('/');
-    if (slash != -1) {
-#if QT_CONFIG(settings)
-        QSettings desktopFile(QFile::decodeName(desktopSession + ".desktop"), QSettings::IniFormat);
-        desktopFile.beginGroup(QStringLiteral("Desktop Entry"));
-        QByteArray desktopName = desktopFile.value(QStringLiteral("DesktopNames")).toByteArray();
-        if (!desktopName.isEmpty())
-            return desktopName;
-#endif
-
-        // try decoding just the basename
-        desktopSession = desktopSession.mid(slash + 1);
-    }
-
-    if (desktopSession == "gnome")
-        return QByteArrayLiteral("GNOME");
-    else if (desktopSession == "xfce")
-        return QByteArrayLiteral("XFCE");
-    else if (desktopSession == "kde")
-        return QByteArrayLiteral("KDE");
-
-    return QByteArrayLiteral("UNKNOWN");
-}
-
-static inline bool checkExecutable(const QString &candidate, QString *result)
-{
-    *result = QStandardPaths::findExecutable(candidate);
-    return !result->isEmpty();
-}
-
-static inline bool detectWebBrowser(const QByteArray &desktop,
-                                    bool checkBrowserVariable,
-                                    QString *browser)
-{
-    const char *browsers[] = {"google-chrome", "firefox", "mozilla", "opera"};
-
-    browser->clear();
-    if (checkExecutable(QStringLiteral("xdg-open"), browser))
-        return true;
-
-    if (checkBrowserVariable) {
-        QByteArray browserVariable = qgetenv("DEFAULT_BROWSER");
-        if (browserVariable.isEmpty())
-            browserVariable = qgetenv("BROWSER");
-        if (!browserVariable.isEmpty() && checkExecutable(QString::fromLocal8Bit(browserVariable), browser))
-            return true;
-    }
-
-    if (desktop == QByteArray("KDE")) {
-        // Konqueror launcher
-        if (checkExecutable(QStringLiteral("kfmclient"), browser)) {
-            browser->append(QLatin1String(" exec"));
-            return true;
-        }
-    } else if (desktop == QByteArray("GNOME")) {
-        if (checkExecutable(QStringLiteral("gnome-open"), browser))
-            return true;
-    }
-
-    for (size_t i = 0; i < sizeof(browsers)/sizeof(char *); ++i)
-        if (checkExecutable(QLatin1String(browsers[i]), browser))
-            return true;
-    return false;
-}
-
-static inline bool launch(const QString &launcher, const QUrl &url)
-{
-    const QString command = launcher + QLatin1Char(' ') + QLatin1String(url.toEncoded());
-    if (debug)
-        qDebug("Launching %s", qPrintable(command));
-#if !QT_CONFIG(process)
-    const bool ok = ::system(qPrintable(command + QLatin1String(" &")));
-#else
-    QStringList args = QProcess::splitCommand(command);
-    bool ok = false;
-    if (!args.isEmpty()) {
-        QString program = args.takeFirst();
-        ok = QProcess::startDetached(program, args);
-    }
-#endif
-    if (!ok)
-        qWarning("Launch failed (%s)", qPrintable(command));
-    return ok;
-}
-
-#if QT_CONFIG(dbus)
-static inline bool checkNeedPortalSupport()
-{
-    return !QStandardPaths::locate(QStandardPaths::RuntimeLocation, QLatin1String("flatpak-info")).isEmpty() || qEnvironmentVariableIsSet("SNAP");
-}
-
-static inline bool isPortalReturnPermanent(const QDBusError &error)
-{
-    // A service unknown error isn't permanent, it just indicates that we
-    // should fall back to the regular way. This check includes
-    // QDBusError::NoError.
-    return error.type() != QDBusError::ServiceUnknown && error.type() != QDBusError::AccessDenied;
-}
-
-static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url)
-{
-    // DBus signature:
-    // OpenFile (IN   s      parent_window,
-    //           IN   h      fd,
-    //           IN   a{sv}  options,
-    //           OUT  o      handle)
-    // Options:
-    // 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);
-    if (fd != -1) {
-        QDBusMessage message = QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.portal.Desktop"),
-                                                              QLatin1String("/org/freedesktop/portal/desktop"),
-                                                              QLatin1String("org.freedesktop.portal.OpenURI"),
-                                                              QLatin1String("OpenFile"));
-
-        QDBusUnixFileDescriptor descriptor;
-        descriptor.giveFileDescriptor(fd);
-
-        // FIXME parent_window_id and handle writable option
-        message << QString() << QVariant::fromValue(descriptor) << QVariantMap();
-
-        return QDBusConnection::sessionBus().call(message);
-    }
-#else
-    Q_UNUSED(url)
-#endif
-
-    return QDBusMessage::createError(QDBusError::InternalError, qt_error_string());
-}
-
-static inline QDBusMessage xdgDesktopPortalOpenUrl(const QUrl &url)
-{
-    // DBus signature:
-    // OpenURI (IN   s      parent_window,
-    //          IN   s      uri,
-    //          IN   a{sv}  options,
-    //          OUT  o      handle)
-    // Options:
-    // 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.
-    //                This key only takes effect the uri points to a local file that is exported in the document portal,
-    //                and the chosen application is sandboxed itself.
-
-    QDBusMessage message = QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.portal.Desktop"),
-                                                          QLatin1String("/org/freedesktop/portal/desktop"),
-                                                          QLatin1String("org.freedesktop.portal.OpenURI"),
-                                                          QLatin1String("OpenURI"));
-    // FIXME parent_window_id and handle writable option
-    message << QString() << url.toString() << QVariantMap();
-
-    return QDBusConnection::sessionBus().call(message);
-}
-
-static inline QDBusMessage xdgDesktopPortalSendEmail(const QUrl &url)
-{
-    // DBus signature:
-    // ComposeEmail (IN   s      parent_window,
-    //               IN   a{sv}  options,
-    //               OUT  o      handle)
-    // Options:
-    // address (s) - The email address to send to.
-    // subject (s) - The subject for the email.
-    // body (s) - The body for the email.
-    // attachment_fds (ah) - File descriptors for files to attach.
-
-    QUrlQuery urlQuery(url);
-    QVariantMap options;
-    options.insert(QLatin1String("address"), url.path());
-    options.insert(QLatin1String("subject"), urlQuery.queryItemValue(QLatin1String("subject")));
-    options.insert(QLatin1String("body"), urlQuery.queryItemValue(QLatin1String("body")));
-
-    // O_PATH seems to be present since Linux 2.6.39, which is not case of RHEL 6
-#ifdef O_PATH
-    QList<QDBusUnixFileDescriptor> attachments;
-    const QStringList attachmentUris = urlQuery.allQueryItemValues(QLatin1String("attachment"));
-
-    for (const QString &attachmentUri : attachmentUris) {
-        const int fd = qt_safe_open(QFile::encodeName(attachmentUri), O_PATH);
-        if (fd != -1) {
-            QDBusUnixFileDescriptor descriptor(fd);
-            attachments << descriptor;
-            qt_safe_close(fd);
-        }
-    }
-
-    options.insert(QLatin1String("attachment_fds"), QVariant::fromValue(attachments));
-#endif
-
-    QDBusMessage message = QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.portal.Desktop"),
-                                                          QLatin1String("/org/freedesktop/portal/desktop"),
-                                                          QLatin1String("org.freedesktop.portal.Email"),
-                                                          QLatin1String("ComposeEmail"));
-
-    // FIXME parent_window_id
-    message << QString() << options;
-
-    return QDBusConnection::sessionBus().call(message);
-}
-#endif // QT_CONFIG(dbus)
-
-QByteArray QGenericUnixServices::desktopEnvironment() const
-{
-    static const QByteArray result = detectDesktopEnvironment();
-    return result;
-}
-
-bool QGenericUnixServices::openUrl(const QUrl &url)
-{
-    if (url.scheme() == QLatin1String("mailto")) {
-#if QT_CONFIG(dbus)
-        if (checkNeedPortalSupport()) {
-            QDBusError error = xdgDesktopPortalSendEmail(url);
-            if (isPortalReturnPermanent(error))
-                return !error.isValid();
-
-            // service not running, fall back
-        }
-#endif
-        return openDocument(url);
-    }
-
-#if QT_CONFIG(dbus)
-    if (checkNeedPortalSupport()) {
-        QDBusError error = xdgDesktopPortalOpenUrl(url);
-        if (isPortalReturnPermanent(error))
-            return !error.isValid();
-    }
-#endif
-
-    if (m_webBrowser.isEmpty() && !detectWebBrowser(desktopEnvironment(), true, &m_webBrowser)) {
-        qWarning("Unable to detect a web browser to launch '%s'", qPrintable(url.toString()));
-        return false;
-    }
-    return launch(m_webBrowser, url);
-}
-
-bool QGenericUnixServices::openDocument(const QUrl &url)
-{
-#if QT_CONFIG(dbus)
-    if (checkNeedPortalSupport()) {
-        QDBusError error = xdgDesktopPortalOpenFile(url);
-        if (isPortalReturnPermanent(error))
-            return !error.isValid();
-    }
-#endif
-
-    if (m_documentLauncher.isEmpty() && !detectWebBrowser(desktopEnvironment(), false, &m_documentLauncher)) {
-        qWarning("Unable to detect a launcher for '%s'", qPrintable(url.toString()));
-        return false;
-    }
-    return launch(m_documentLauncher, url);
-}
-
-#else
-QByteArray QGenericUnixServices::desktopEnvironment() const
-{
-    return QByteArrayLiteral("UNKNOWN");
-}
-
-bool QGenericUnixServices::openUrl(const QUrl &url)
-{
-    Q_UNUSED(url)
-    qWarning("openUrl() not supported on this platform");
-    return false;
-}
-
-bool QGenericUnixServices::openDocument(const QUrl &url)
-{
-    Q_UNUSED(url)
-    qWarning("openDocument() not supported on this platform");
-    return false;
-}
-
-#endif // QT_NO_MULTIPROCESS
-
-QT_END_NAMESPACE
diff --git a/src/platformsupport/services/genericunix/qgenericunixservices_p.h b/src/platformsupport/services/genericunix/qgenericunixservices_p.h
deleted file mode 100644
index 8ac3de6f03..0000000000
--- a/src/platformsupport/services/genericunix/qgenericunixservices_p.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGENERICUNIXDESKTOPSERVICES_H
-#define QGENERICUNIXDESKTOPSERVICES_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <qpa/qplatformservices.h>
-#include <QtCore/QString>
-
-QT_BEGIN_NAMESPACE
-
-class QGenericUnixServices : public QPlatformServices
-{
-public:
-    QGenericUnixServices() {}
-
-    QByteArray desktopEnvironment() const override;
-
-    bool openUrl(const QUrl &url) override;
-    bool openDocument(const QUrl &url) override;
-
-private:
-    QString m_webBrowser;
-    QString m_documentLauncher;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGENERICUNIXDESKTOPSERVICES_H
diff --git a/src/platformsupport/services/services.pro b/src/platformsupport/services/services.pro
deleted file mode 100644
index 7ff5e8e179..0000000000
--- a/src/platformsupport/services/services.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TARGET = QtServiceSupport
-MODULE = service_support
-
-QT = core-private gui-private
-qtConfig(dbus): QT += dbus
-
-CONFIG += static internal_module
-
-DEFINES += QT_NO_CAST_FROM_ASCII
-PRECOMPILED_HEADER = ../../corelib/global/qt_pch.h
-
-include($$PWD/genericunix/genericunix.pri)
-
-load(qt_module)