Remove widgets lib dependency on platformsupport.

Instead of the dependency add the one needed function as virtual to
the QPlatformServices in QtGui.

Change-Id: Ia4455f5ac88ec4d0480bd81635cebba62bbd8ac5
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

2 files changed, 10 insertions, 20 deletions

diff --git a/src/platformsupport/services/genericunix/qgenericunixservices.cpp b/src/platformsupport/services/genericunix/qgenericunixservices.cpp
index 34f46e4e6e..168ecf82e4 100644
--- a/src/platformsupport/services/genericunix/qgenericunixservices.cpp
+++ b/src/platformsupport/services/genericunix/qgenericunixservices.cpp
@@ -52,14 +52,14 @@ QT_BEGIN_NAMESPACE
 
 enum { debug = 0 };
 
-static inline QGenericUnixServices::DesktopEnvironment detectDesktopEnvironment()
+static inline QByteArray detectDesktopEnvironment()
 {
     if (!qgetenv("KDE_FULL_SESSION").isEmpty())
-        return QGenericUnixServices::DE_KDE;
+        return QByteArray("KDE");
     // GNOME_DESKTOP_SESSION_ID is deprecated for some reason, but still check it
     if (qgetenv("DESKTOP_SESSION") == "gnome" || !qgetenv("GNOME_DESKTOP_SESSION_ID").isEmpty())
-        return QGenericUnixServices::DE_GNOME;
-    return QGenericUnixServices::DE_UNKNOWN;
+        return QByteArray("GNOME");
+    return QByteArray("UNKNOWN");
 }
 
 static inline bool checkExecutable(const QString &candidate, QString *result)
@@ -68,7 +68,7 @@ static inline bool checkExecutable(const QString &candidate, QString *result)
     return !result->isEmpty();
 }
 
-static inline bool detectWebBrowser(QGenericUnixServices::DesktopEnvironment desktop,
+static inline bool detectWebBrowser(QByteArray desktop,
                                     bool checkBrowserVariable,
                                     QString *browser)
 {
@@ -86,19 +86,15 @@ static inline bool detectWebBrowser(QGenericUnixServices::DesktopEnvironment des
             return true;
     }
 
-    switch (desktop) {
-    case QGenericUnixServices::DE_UNKNOWN:
-        break;
-    case QGenericUnixServices::DE_KDE:
+    if (desktop == QByteArray("KDE")) {
         // Konqueror launcher
         if (checkExecutable(QStringLiteral("kfmclient"), browser)) {
             browser->append(QStringLiteral(" exec"));
             return true;
         }
-    case QGenericUnixServices::DE_GNOME:
+    } else if (desktop == QByteArray("GNOME")) {
         if (checkExecutable(QStringLiteral("gnome-open"), browser))
             return true;
-        break;
     }
 
     for (size_t i = 0; i < sizeof(browsers)/sizeof(char *); ++i)
@@ -122,9 +118,9 @@ static inline bool launch(const QString &launcher, const QUrl &url)
     return ok;
 }
 
-QGenericUnixServices::DesktopEnvironment QGenericUnixServices::desktopEnvironment()
+QByteArray QGenericUnixServices::desktopEnvironment() const
 {
-    static const DesktopEnvironment result = detectDesktopEnvironment();
+    static const QByteArray result = detectDesktopEnvironment();
     return result;
 }
 
diff --git a/src/platformsupport/services/genericunix/qgenericunixservices_p.h b/src/platformsupport/services/genericunix/qgenericunixservices_p.h
index b0dbccc099..098112a185 100644
--- a/src/platformsupport/services/genericunix/qgenericunixservices_p.h
+++ b/src/platformsupport/services/genericunix/qgenericunixservices_p.h
@@ -52,15 +52,9 @@ QT_BEGIN_NAMESPACE
 class QGenericUnixServices : public QPlatformServices
 {
 public:
-    enum DesktopEnvironment {
-        DE_UNKNOWN,
-        DE_KDE,
-        DE_GNOME
-    };
-
     QGenericUnixServices() {}
 
-    static DesktopEnvironment desktopEnvironment();
+    QByteArray desktopEnvironment() const;
 
     virtual bool openUrl(const QUrl &url);
     virtual bool openDocument(const QUrl &url);