diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-19 15:26:56 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-20 08:06:50 +0000 |
commit | b16f0030f348965a81698063b7f8a0a82de5a1e6 (patch) | |
tree | 04e4acaea51d46de92693cecf6d5661f8bd46f1a /src/imports/platform/qquickplatformiconloader.cpp | |
parent | 7a1d2e71d7aff9ab31e267e1e07280a39165640b (diff) |
Platform: make icon a grouped property
[ChangeLog][Platform][Menu] Deprecated iconName and iconSource
properties in favor of icon.name and icon.source grouped properties.
[ChangeLog][Platform][MenuItem] Deprecated iconName and iconSource
properties in favor of icon.name and icon.source grouped properties.
[ChangeLog][Platform][SystemTrayIcon] Deprecated iconName and iconSource
properties in favor of icon.name and icon.source grouped properties.
Task-number: QTBUG-67730
Change-Id: I08bbb2bb5ed2aaae02f9264c63fb6cfa04240a74
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/platform/qquickplatformiconloader.cpp')
-rw-r--r-- | src/imports/platform/qquickplatformiconloader.cpp | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/src/imports/platform/qquickplatformiconloader.cpp b/src/imports/platform/qquickplatformiconloader.cpp index 11ebd476..6d4d486e 100644 --- a/src/imports/platform/qquickplatformiconloader.cpp +++ b/src/imports/platform/qquickplatformiconloader.cpp @@ -62,42 +62,30 @@ void QQuickPlatformIconLoader::setEnabled(bool enabled) loadIcon(); } -QIcon QQuickPlatformIconLoader::icon() const +QIcon QQuickPlatformIconLoader::toQIcon() const { QIcon fallback = QPixmap::fromImage(image()); - return QIcon::fromTheme(m_iconName, fallback); + return QIcon::fromTheme(m_icon.name(), fallback); } -QUrl QQuickPlatformIconLoader::iconSource() const +QQuickPlatformIcon QQuickPlatformIconLoader::icon() const { - return m_iconSource; + return m_icon; } -void QQuickPlatformIconLoader::setIconSource(const QUrl& source) +void QQuickPlatformIconLoader::setIcon(const QQuickPlatformIcon& icon) { - m_iconSource = source; - if (m_enabled) - loadIcon(); -} - -QString QQuickPlatformIconLoader::iconName() const -{ - return m_iconName; -} - -void QQuickPlatformIconLoader::setIconName(const QString& name) -{ - m_iconName = name; + m_icon = icon; if (m_enabled) loadIcon(); } void QQuickPlatformIconLoader::loadIcon() { - if (m_iconSource.isEmpty()) { + if (m_icon.source().isEmpty()) { clear(m_parent); } else { - load(qmlEngine(m_parent), m_iconSource); + load(qmlEngine(m_parent), m_icon.source()); if (m_slot != -1 && isLoading()) { connectFinished(m_parent, m_slot); m_slot = -1; |