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_p.h | |
| 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_p.h')
| -rw-r--r-- | src/imports/platform/qquickplatformiconloader_p.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/imports/platform/qquickplatformiconloader_p.h b/src/imports/platform/qquickplatformiconloader_p.h index dd26a65b..d284a513 100644 --- a/src/imports/platform/qquickplatformiconloader_p.h +++ b/src/imports/platform/qquickplatformiconloader_p.h @@ -53,6 +53,8 @@ #include <QtGui/qicon.h> #include <QtQuick/private/qquickpixmapcache_p.h> +#include "qquickplatformicon_p.h" + QT_BEGIN_NAMESPACE class QObject; @@ -65,13 +67,10 @@ public: bool isEnabled() const; void setEnabled(bool enabled); - QIcon icon() const; - - QUrl iconSource() const; - void setIconSource(const QUrl &source); + QIcon toQIcon() const; - QString iconName() const; - void setIconName(const QString &name); + QQuickPlatformIcon icon() const; + void setIcon(const QQuickPlatformIcon &icon); private: void loadIcon(); @@ -79,9 +78,7 @@ private: QObject *m_parent; int m_slot; bool m_enabled; - QIcon m_icon; - QUrl m_iconSource; - QString m_iconName; + QQuickPlatformIcon m_icon; }; QT_END_NAMESPACE |