Refactor QQuickIconLoader.

Instead using a QObject with a single icon member variable
that needs to be instantiated for each task bar button, introduce a static
load function that takes a member function pointer accepting a QVariant.
For synchronous requests, invoke it immediately; connect it to a slot
for network requests.

Task-number: QTBUG-36730
Change-Id: Ic70422d98d0bc3d486b32fb3534400b9fff8d324
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/src/imports/winextras/qquicktaskbarbutton_p.h b/src/imports/winextras/qquicktaskbarbutton_p.h
index d24947d..2849dab 100644
--- a/src/imports/winextras/qquicktaskbarbutton_p.h
+++ b/src/imports/winextras/qquicktaskbarbutton_p.h
@@ -47,10 +47,9 @@
 #include <QWinTaskbarButton>
 #include <QWinTaskbarProgress>
 
-#include "qquickiconloader_p.h"
-
 QT_BEGIN_NAMESPACE
 
+class QVariant;
 class QQuickTaskbarButtonPrivate;
 
 class QQuickTaskbarOverlay : public QObject
@@ -73,11 +72,10 @@ Q_SIGNALS:
     void accessibleDescriptionChanged();
 
 private Q_SLOTS:
-    void iconLoaded();
+    void iconLoaded(const QVariant &);
 
 private:
     QUrl m_iconSource;
-    QQuickIconLoader m_loader;
     QWinTaskbarButton *m_button;
 };