equal
deleted
inserted
replaced
45 #include <qstyle.h> |
45 #include <qstyle.h> |
46 #include <qapplication.h> |
46 #include <qapplication.h> |
47 #include <qdir.h> |
47 #include <qdir.h> |
48 #include <qpixmapcache.h> |
48 #include <qpixmapcache.h> |
49 #if defined(Q_WS_WIN) |
49 #if defined(Q_WS_WIN) |
50 #define _WIN32_IE 0x0500 |
50 # define _WIN32_IE 0x0500 |
51 #include <qt_windows.h> |
51 # include <qt_windows.h> |
52 #include <commctrl.h> |
52 # include <commctrl.h> |
53 #include <objbase.h> |
53 # include <objbase.h> |
54 #elif defined(Q_WS_MAC) |
54 #elif defined(Q_WS_MAC) |
55 #include <private/qt_cocoa_helpers_mac_p.h> |
55 # include <private/qt_cocoa_helpers_mac_p.h> |
56 #endif |
|
57 |
|
58 #if defined(Q_WS_X11) && !defined(Q_NO_STYLE_GTK) |
|
59 #include <private/qt_x11_p.h> |
|
60 #include <private/gtksymbols_p.h> |
|
61 #endif |
56 #endif |
62 |
57 |
63 #include <private/qfunctions_p.h> |
58 #include <private/qfunctions_p.h> |
64 #include <private/qguiplatformplugin_p.h> |
59 #include <private/qguiplatformplugin_p.h> |
65 |
60 |
|
61 #if defined(Q_WS_X11) && !defined(Q_NO_STYLE_GTK) |
|
62 # include <private/qgtkstyle_p.h> |
|
63 # include <private/qt_x11_p.h> |
|
64 #endif |
|
65 |
66 #ifndef SHGFI_ADDOVERLAYS |
66 #ifndef SHGFI_ADDOVERLAYS |
67 #define SHGFI_ADDOVERLAYS 0x000000020 |
67 # define SHGFI_ADDOVERLAYS 0x000000020 |
68 #endif |
68 #endif |
69 |
69 |
70 QT_BEGIN_NAMESPACE |
70 QT_BEGIN_NAMESPACE |
71 |
71 |
72 /*! |
72 /*! |
390 if (!platformIcon.isNull()) |
390 if (!platformIcon.isNull()) |
391 return platformIcon; |
391 return platformIcon; |
392 |
392 |
393 #if defined(Q_WS_X11) && !defined(QT_NO_STYLE_GTK) |
393 #if defined(Q_WS_X11) && !defined(QT_NO_STYLE_GTK) |
394 if (X11->desktopEnvironment == DE_GNOME) { |
394 if (X11->desktopEnvironment == DE_GNOME) { |
395 QIcon gtkIcon = QGtk::getFilesystemIcon(info); |
395 QIcon gtkIcon = QGtkStylePrivate::getFilesystemIcon(info); |
396 if (!gtkIcon.isNull()) |
396 if (!gtkIcon.isNull()) |
397 return gtkIcon; |
397 return gtkIcon; |
398 } |
398 } |
399 #endif |
399 #endif |
400 |
400 |