AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable Gtk file icons

Browse Source 
This needs some build system fixes to let widgets depend on
the platform support library (and be built after it).

Change-Id: I6f5b878971d1002a18e2fd66db4f34ffd0ac939a
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
This commit is contained in:
Frederik Gladhorn 2012-03-15 15:05:59 +01:00 committed by Qt by Nokia
parent f31b324a24
commit 49e7ff443b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/src.pro
View File

@ -5,7 +5,7 @@ unset(SRC_SUBDIRS)
win32:SRC_SUBDIRS += src_winmain win32:SRC_SUBDIRS += src_winmain
!wince*:include(tools/tools.pro) !wince*:include(tools/tools.pro)
SRC_SUBDIRS += src_corelib SRC_SUBDIRS += src_corelib
SRC_SUBDIRS += src_network src_sql src_gui src_xml src_widgets src_testlib src_platformsupport SRC_SUBDIRS += src_network src_sql src_gui src_xml src_testlib src_platformsupport src_widgets
!wince*:SRC_SUBDIRS += src_printsupport !wince*:SRC_SUBDIRS += src_printsupport
nacl: SRC_SUBDIRS -= src_network src_testlib nacl: SRC_SUBDIRS -= src_network src_testlib
contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
@ -54,7 +54,7 @@ src_concurrent.target = sub-concurrent
src_gui.depends = src_corelib src_gui.depends = src_corelib
src_printsupport.depends = src_corelib src_gui src_widgets src_printsupport.depends = src_corelib src_gui src_widgets
src_platformsupport.depends = src_corelib src_gui src_network src_platformsupport.depends = src_corelib src_gui src_network
src_widgets.depends = src_corelib src_gui src_tools_uic src_widgets.depends = src_corelib src_gui src_tools_uic src_platformsupport
src_xml.depends = src_corelib src_xml.depends = src_corelib
src_concurrent.depends = src_corelib src_concurrent.depends = src_corelib
src_dbus.depends = src_corelib src_dbus.depends = src_corelib

8
src/widgets/itemviews/qfileiconprovider.cpp
View File

@ -58,9 +58,9 @@
# include <private/qt_cocoa_helpers_mac_p.h> # include <private/qt_cocoa_helpers_mac_p.h>
#endif #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/qgtkstyle_p.h>
# include <private/qt_x11_p.h> # include <QtPlatformSupport/private/qgenericunixservices_p.h>
#endif #endif
#ifndef SHGFI_ADDOVERLAYS #ifndef SHGFI_ADDOVERLAYS
@ -399,8 +399,8 @@ QIcon QFileIconProvider::icon(const QFileInfo &info) const
{ {
Q_D(const QFileIconProvider); Q_D(const QFileIconProvider);
#if defined(Q_WS_X11) && !defined(QT_NO_STYLE_GTK) #if defined(Q_OS_UNIX) && !defined(QT_NO_STYLE_GTK)
if (X11->desktopEnvironment == DE_GNOME) { if (QGenericUnixServices::desktopEnvironment() == QGenericUnixServices::DE_GNOME) {
QIcon gtkIcon = QGtkStylePrivate::getFilesystemIcon(info); QIcon gtkIcon = QGtkStylePrivate::getFilesystemIcon(info);
if (!gtkIcon.isNull()) if (!gtkIcon.isNull())
return gtkIcon; return gtkIcon;

2
src/widgets/widgets.pro
View File

@ -2,7 +2,7 @@ load(qt_module)
TARGET = QtWidgets TARGET = QtWidgets
QPRO_PWD = $$PWD QPRO_PWD = $$PWD
QT = core core-private gui gui-private QT = core core-private gui gui-private platformsupport-private
CONFIG += module CONFIG += module
MODULE_PRI = ../modules/qt_widgets.pri MODULE_PRI = ../modules/qt_widgets.pri