diff options
| author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2012-06-06 15:01:59 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-08 04:47:59 +0200 |
| commit | 21e0d164110a4a1ff824e4014957353765542c2d (patch) | |
| tree | 9972ad9d441e58cf959bfbd1d44bce657109594a /src/widgets | |
| parent | 168c583a783196181b7aa601d644459d7e0de92d (diff) | |
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>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/itemviews/qfileiconprovider.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/itemviews/qfileiconprovider.cpp b/src/widgets/itemviews/qfileiconprovider.cpp index b7d317a9c2..074a3ec4cf 100644 --- a/src/widgets/itemviews/qfileiconprovider.cpp +++ b/src/widgets/itemviews/qfileiconprovider.cpp @@ -47,6 +47,9 @@ #include <qdir.h> #include <qpixmapcache.h> #include <private/qfunctions_p.h> +#include <private/qguiapplication_p.h> +#include <qpa/qplatformintegration.h> +#include <qpa/qplatformservices.h> #if defined(Q_OS_WIN) # define _WIN32_IE 0x0500 @@ -60,7 +63,6 @@ #if defined(Q_OS_UNIX) && !defined(QT_NO_STYLE_GTK) # include <private/qgtkstyle_p.h> -# include <QtPlatformSupport/private/qgenericunixservices_p.h> #endif #ifndef SHGFI_ADDOVERLAYS @@ -400,7 +402,7 @@ QIcon QFileIconProvider::icon(const QFileInfo &info) const Q_D(const QFileIconProvider); #if defined(Q_OS_UNIX) && !defined(QT_NO_STYLE_GTK) - if (QGenericUnixServices::desktopEnvironment() == QGenericUnixServices::DE_GNOME) { + if (QGuiApplicationPrivate::platformIntegration()->services()->desktopEnvironment() == QByteArray("GNOME")) { QIcon gtkIcon = QGtkStylePrivate::getFilesystemIcon(info); if (!gtkIcon.isNull()) return gtkIcon; |