diff options
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/itemviews/qfileiconprovider.cpp | 8 | ||||
| -rw-r--r-- | src/widgets/widgets.pro | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/itemviews/qfileiconprovider.cpp b/src/widgets/itemviews/qfileiconprovider.cpp index 5356b67f99..b7d317a9c2 100644 --- a/src/widgets/itemviews/qfileiconprovider.cpp +++ b/src/widgets/itemviews/qfileiconprovider.cpp @@ -58,9 +58,9 @@ # include <private/qt_cocoa_helpers_mac_p.h> #endif -#if defined(Q_WS_X11) && !defined(Q_NO_STYLE_GTK) +#if defined(Q_OS_UNIX) && !defined(QT_NO_STYLE_GTK) # include <private/qgtkstyle_p.h> -# include <private/qt_x11_p.h> +# include <QtPlatformSupport/private/qgenericunixservices_p.h> #endif #ifndef SHGFI_ADDOVERLAYS @@ -399,8 +399,8 @@ QIcon QFileIconProvider::icon(const QFileInfo &info) const { Q_D(const QFileIconProvider); -#if defined(Q_WS_X11) && !defined(QT_NO_STYLE_GTK) - if (X11->desktopEnvironment == DE_GNOME) { +#if defined(Q_OS_UNIX) && !defined(QT_NO_STYLE_GTK) + if (QGenericUnixServices::desktopEnvironment() == QGenericUnixServices::DE_GNOME) { QIcon gtkIcon = QGtkStylePrivate::getFilesystemIcon(info); if (!gtkIcon.isNull()) return gtkIcon; diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index ad1f29259e..4e46ffca45 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -2,7 +2,7 @@ load(qt_module) TARGET = QtWidgets QPRO_PWD = $$PWD -QT = core core-private gui gui-private +QT = core core-private gui gui-private platformsupport-private CONFIG += module MODULE_PRI = ../modules/qt_widgets.pri |