2 files changed, 102 insertions, 1 deletions

diff --git a/src/gui/kernel/qplatformtheme.cpp b/src/gui/kernel/qplatformtheme.cpp
index b91d3d0281..2e896eecf4 100644
--- a/src/gui/kernel/qplatformtheme.cpp
+++ b/src/gui/kernel/qplatformtheme.cpp
@@ -43,6 +43,7 @@
 
 #include <QtCore/QVariant>
 #include <QtCore/QStringList>
+#include <QtCore/qfileinfo.h>
 #include <qpalette.h>
 #include <qtextformat.h>
 
@@ -164,6 +165,22 @@ const QFont *QPlatformTheme::font(Font type) const
     return 0;
 }
 
+QPixmap QPlatformTheme::standardPixmap(StandardPixmap sp, const QSizeF &size) const
+{
+    Q_UNUSED(sp);
+    Q_UNUSED(size);
+    // TODO Should return QCommonStyle pixmaps?
+    return QPixmap();
+}
+
+QPixmap QPlatformTheme::fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size) const
+{
+    Q_UNUSED(fileInfo);
+    Q_UNUSED(size);
+    // TODO Should return QCommonStyle pixmaps?
+    return QPixmap();
+}
+
 QVariant QPlatformTheme::themeHint(ThemeHint hint) const
 {
     return QPlatformTheme::defaultThemeHint(hint);
@@ -223,6 +240,8 @@ QVariant QPlatformTheme::defaultThemeHint(ThemeHint hint)
         return QVariant(int(QTextCharFormat::SpellCheckUnderline));
     case TabAllWidgets:
         return QVariant(true);
+    case IconPixmapSizes:
+        return QVariant::fromValue(QList<int>());
     }
     return QVariant();
 }
diff --git a/src/gui/kernel/qplatformtheme.h b/src/gui/kernel/qplatformtheme.h
index 398339255c..25453e792f 100644
--- a/src/gui/kernel/qplatformtheme.h
+++ b/src/gui/kernel/qplatformtheme.h
@@ -67,6 +67,9 @@ class QPlatformSystemTrayIcon;
 class QVariant;
 class QPalette;
 class QFont;
+class QPixmap;
+class QSizeF;
+class QFileInfo;
 
 class Q_GUI_EXPORT QPlatformTheme
 {
@@ -97,7 +100,8 @@ public:
         KeyboardScheme,
         UiEffects,
         SpellCheckUnderlineStyle,
-        TabAllWidgets
+        TabAllWidgets,
+        IconPixmapSizes
     };
 
     enum DialogType {
@@ -150,6 +154,81 @@ public:
         NFonts
     };
 
+    enum StandardPixmap {  // Keep in sync with QStyle::StandardPixmap
+        TitleBarMenuButton,
+        TitleBarMinButton,
+        TitleBarMaxButton,
+        TitleBarCloseButton,
+        TitleBarNormalButton,
+        TitleBarShadeButton,
+        TitleBarUnshadeButton,
+        TitleBarContextHelpButton,
+        DockWidgetCloseButton,
+        MessageBoxInformation,
+        MessageBoxWarning,
+        MessageBoxCritical,
+        MessageBoxQuestion,
+        DesktopIcon,
+        TrashIcon,
+        ComputerIcon,
+        DriveFDIcon,
+        DriveHDIcon,
+        DriveCDIcon,
+        DriveDVDIcon,
+        DriveNetIcon,
+        DirOpenIcon,
+        DirClosedIcon,
+        DirLinkIcon,
+        DirLinkOpenIcon,
+        FileIcon,
+        FileLinkIcon,
+        ToolBarHorizontalExtensionButton,
+        ToolBarVerticalExtensionButton,
+        FileDialogStart,
+        FileDialogEnd,
+        FileDialogToParent,
+        FileDialogNewFolder,
+        FileDialogDetailedView,
+        FileDialogInfoView,
+        FileDialogContentsView,
+        FileDialogListView,
+        FileDialogBack,
+        DirIcon,
+        DialogOkButton,
+        DialogCancelButton,
+        DialogHelpButton,
+        DialogOpenButton,
+        DialogSaveButton,
+        DialogCloseButton,
+        DialogApplyButton,
+        DialogResetButton,
+        DialogDiscardButton,
+        DialogYesButton,
+        DialogNoButton,
+        ArrowUp,
+        ArrowDown,
+        ArrowLeft,
+        ArrowRight,
+        ArrowBack,
+        ArrowForward,
+        DirHomeIcon,
+        CommandLink,
+        VistaShield,
+        BrowserReload,
+        BrowserStop,
+        MediaPlay,
+        MediaStop,
+        MediaPause,
+        MediaSkipForward,
+        MediaSkipBackward,
+        MediaSeekForward,
+        MediaSeekBackward,
+        MediaVolume,
+        MediaVolumeMuted,
+        // do not add any values below/greater than this
+        CustomBase = 0xf0000000
+    };
+
     enum KeyboardSchemes
     {
         WindowsKeyboardScheme,
@@ -190,6 +269,9 @@ public:
 
     virtual QVariant themeHint(ThemeHint hint) const;
 
+    virtual QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const;
+    virtual QPixmap fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size) const;
+
     static QVariant defaultThemeHint(ThemeHint hint);
 };