aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/platform/qquickplatformiconloader_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/platform/qquickplatformiconloader_p.h')
-rw-r--r--src/imports/platform/qquickplatformiconloader_p.h15
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