From 6aaafd55328c1860fd1b734fa29ff77673538a2b Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Tue, 25 Jun 2013 15:39:11 -0400
Subject: unitymenumodel: add support for icons

For now, this includes themed icons, file icons, and icons send as raw data.
---
 libqmenumodel/QMenuModel/CMakeLists.txt | 2 +-
 libqmenumodel/QMenuModel/plugin.cpp     | 6 ++++++
 libqmenumodel/QMenuModel/plugin.h       | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'libqmenumodel/QMenuModel')

diff --git a/libqmenumodel/QMenuModel/CMakeLists.txt b/libqmenumodel/QMenuModel/CMakeLists.txt
index 7367e18..78e062b 100644
--- a/libqmenumodel/QMenuModel/CMakeLists.txt
+++ b/libqmenumodel/QMenuModel/CMakeLists.txt
@@ -19,7 +19,7 @@ target_link_libraries(qmenumodel-qml
     ${GIO_LDFLAGS}
 )
 
-qt5_use_modules(qmenumodel-qml Qml Widgets)
+qt5_use_modules(qmenumodel-qml Qml Quick)
 
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
                                                               "${CMAKE_CURRENT_BINARY_DIR}/qmldir")
diff --git a/libqmenumodel/QMenuModel/plugin.cpp b/libqmenumodel/QMenuModel/plugin.cpp
index f529c0a..0629099 100644
--- a/libqmenumodel/QMenuModel/plugin.cpp
+++ b/libqmenumodel/QMenuModel/plugin.cpp
@@ -23,9 +23,15 @@
 #include "qdbusactiongroup.h"
 #include "qstateaction.h"
 #include "unitymenumodel.h"
+#include "unitythemediconprovider.h"
 
 #include <QtQml>
 
+void QMenuModelQmlPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    engine->addImageProvider("theme", new UnityThemedIconProvider);
+}
+
 void QMenuModelQmlPlugin::registerTypes(const char *uri)
 {
     qmlRegisterUncreatableType<QMenuModel>(uri, 0, 1, "QMenuModel",
diff --git a/libqmenumodel/QMenuModel/plugin.h b/libqmenumodel/QMenuModel/plugin.h
index fc732d2..3474139 100644
--- a/libqmenumodel/QMenuModel/plugin.h
+++ b/libqmenumodel/QMenuModel/plugin.h
@@ -28,6 +28,7 @@ class QMenuModelQmlPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "com.canonical.qmenumodel")
 
 public:
+    void initializeEngine(QQmlEngine *engine, const char *uri);
     void registerTypes(const char *uri);
 };
 
-- 
cgit v1.2.3