diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-08-08 12:08:53 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-09 11:32:18 +0000 |
| commit | c2e925ac6b69d3cc0be9946156afffca6211777b (patch) | |
| tree | 948aa2bd3d366f25e7d15841fdde605576f57daf /src/quickcontrols2/qquickproxytheme_p.h | |
| parent | c02d23360186b43fcd570e1c7fc666cb14b487d6 (diff) | |
Update QQuickProxyTheme::fileIcon
2cd2cba0868efb7e8dd2d00805f1a5ceed0a1349 in qtbase removed
fileIconPixmap and switched to fileIcon. QQuickProxyTheme needs to be
update accordingly to fix compilation of the module.
Change-Id: If3e6cae09cd6e86cd1058d180f75481a20a5b9f6
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quickcontrols2/qquickproxytheme_p.h')
| -rw-r--r-- | src/quickcontrols2/qquickproxytheme_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quickcontrols2/qquickproxytheme_p.h b/src/quickcontrols2/qquickproxytheme_p.h index c94417dc..c2cec4f7 100644 --- a/src/quickcontrols2/qquickproxytheme_p.h +++ b/src/quickcontrols2/qquickproxytheme_p.h @@ -80,8 +80,7 @@ public: QVariant themeHint(ThemeHint hint) const override; QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const override; - QPixmap fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size, - QPlatformTheme::IconOptions iconOptions = 0) const override; + QIcon fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions iconOptions = 0) const override; QIconEngine *createIconEngine(const QString &iconName) const override; |