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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/quickcontrols2/qquickproxytheme.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quickcontrols2/qquickproxytheme.cpp b/src/quickcontrols2/qquickproxytheme.cpp index da4f2a2e..3791bb06 100644 --- a/src/quickcontrols2/qquickproxytheme.cpp +++ b/src/quickcontrols2/qquickproxytheme.cpp @@ -137,11 +137,11 @@ QPixmap QQuickProxyTheme::standardPixmap(QPlatformTheme::StandardPixmap sp, cons return QPlatformTheme::standardPixmap(sp, size); } -QPixmap QQuickProxyTheme::fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size, QPlatformTheme::IconOptions iconOptions) const +QIcon QQuickProxyTheme::fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions iconOptions) const { if (m_theme) - return m_theme->fileIconPixmap(fileInfo, size, iconOptions); - return QPlatformTheme::fileIconPixmap(fileInfo, size, iconOptions); + return m_theme->fileIcon(fileInfo, iconOptions); + return QPlatformTheme::fileIcon(fileInfo, iconOptions); } QIconEngine *QQuickProxyTheme::createIconEngine(const QString &iconName) const |