diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-07-27 14:00:14 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-08-05 08:06:21 +0000 |
| commit | 2cd2cba0868efb7e8dd2d00805f1a5ceed0a1349 (patch) | |
| tree | 7fff626ad15f65aeb09508559d82b94f97337714 /src/gui | |
| parent | 955b2bdfc0cb1d707f8914be230e5e00c548b6ab (diff) | |
QtPlatformSupport: Add QAbstractFileIconEngine
Move the code from QtWidgets/QFileIconEngine into a new class with
virtuals in QtPlatformSupport so that platforms can reuse it.
Prototypically use the class in the Windows and macOS QPA plugins.
Remove QPlatformTheme::fileIconPixmap() and change the type
of the hint QPlatformTheme::IconPixmapSizes from QList<int>
to QList<QSize> so that it fits better with the icon code.
Change-Id: I580e936f3507218757565ca099272cd575b3a779
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qplatformtheme.cpp | 10 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformtheme.h | 3 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/gui/kernel/qplatformtheme.cpp b/src/gui/kernel/qplatformtheme.cpp index a00c572e07..d80ab8b597 100644 --- a/src/gui/kernel/qplatformtheme.cpp +++ b/src/gui/kernel/qplatformtheme.cpp @@ -424,16 +424,6 @@ QIcon QPlatformTheme::fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOp return QIcon(); } -QPixmap QPlatformTheme::fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size, - QPlatformTheme::IconOptions iconOptions) const -{ - Q_UNUSED(fileInfo); - Q_UNUSED(size); - Q_UNUSED(iconOptions); - // TODO Should return QCommonStyle pixmaps? - return QPixmap(); -} - QVariant QPlatformTheme::themeHint(ThemeHint hint) const { // For theme hints which mirror platform integration style hints, query diff --git a/src/gui/kernel/qplatformtheme.h b/src/gui/kernel/qplatformtheme.h index c04ebd2190..a8baca1967 100644 --- a/src/gui/kernel/qplatformtheme.h +++ b/src/gui/kernel/qplatformtheme.h @@ -304,9 +304,6 @@ public: virtual QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const; virtual QIcon fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions iconOptions = 0) const; - virtual QPixmap fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size, - QPlatformTheme::IconOptions iconOptions = 0) const; - virtual QIconEngine *createIconEngine(const QString &iconName) const; virtual QList<QKeySequence> keyBindings(QKeySequence::StandardKey key) const; |