5 files changed, 18 insertions, 10 deletions

diff --git a/applications/kmail-quick/package/contents/ui/FolderListView.qml b/applications/kmail-quick/package/contents/ui/FolderListView.qml
index 807e1568..f5ed7765 100644
--- a/applications/kmail-quick/package/contents/ui/FolderListView.qml
+++ b/applications/kmail-quick/package/contents/ui/FolderListView.qml
@@ -21,11 +21,15 @@ import QtQuick.Layouts 1.1
 
 import org.kde.plasma.core 2.0 as PlasmaCore
 
-
+import org.kde.akonadi2.mail 1.0 as Mail
 
 Item {
     id: root
 
+    Mail.FolderList {
+        id: folderList
+    }
+
     Item {
         id: searchBox
 
@@ -56,7 +60,7 @@ Item {
 
             clip: true
 
-            model: FolderModel {}
+            model: folderList.model //FolderModel {}
 
             delegate: ListItem {
 
diff --git a/framework/mail/folderlistcontroller.cpp b/framework/mail/folderlistcontroller.cpp
index 900e378d..9edc547c 100644
--- a/framework/mail/folderlistcontroller.cpp
+++ b/framework/mail/folderlistcontroller.cpp
@@ -25,6 +25,11 @@ void FolderListController::setAccountId(const QString &id)
     }
 }
 
+FolderListModel* FolderListController::model() const
+{
+    return m_model.data();
+}
+
 void FolderListController::loadFolders(const QString &id)
 {
     //load foldermodel from akonadi
diff --git a/framework/mail/folderlistcontroller.h b/framework/mail/folderlistcontroller.h
index 18f5624d..84ce24be 100644
--- a/framework/mail/folderlistcontroller.h
+++ b/framework/mail/folderlistcontroller.h
@@ -1,15 +1,16 @@
 #pragma once
 
+#include "folderlistmodel.h"
+
 #include <QObject>
 #include <QScopedPointer>
 #include <QString>
-#include <QAbstractItemModel>
 
 class FolderListController : public QObject
 {
     Q_OBJECT
     Q_PROPERTY (QString accountId READ accountId WRITE setAccountId NOTIFY accountIdChanged)
-    Q_PROPERTY (QAbstractItemModel *model READ model CONSTANT)
+    Q_PROPERTY (FolderListModel *model READ model CONSTANT)
 
 public:
     explicit FolderListController(QObject *parent = Q_NULLPTR);
@@ -17,7 +18,7 @@ public:
     QString accountId() const;
     void setAccountId(const QString &id);
 
-    QAbstractItemModel *model() const;
+    FolderListModel *model() const;
 
     void loadFolders(const QString &id);
 
@@ -31,5 +32,5 @@ public slots:
 
 private:
     QString m_accountId;
-    QScopedPointer<QAbstractItemModel> m_model;
+    QScopedPointer<FolderListModel> m_model;
 };
diff --git a/framework/mail/folderlistmodel.cpp b/framework/mail/folderlistmodel.cpp
index d7889da4..b4b31585 100644
--- a/framework/mail/folderlistmodel.cpp
+++ b/framework/mail/folderlistmodel.cpp
@@ -10,9 +10,8 @@ FolderListModel::FolderListModel(QObject *parent) : QIdentityProxyModel()
     QList<QByteArray> requestedProperties;
     requestedProperties << "name" << "icon";
     query.requestedProperties = requestedProperties.toSet();
-    //TODO
-    //mModel = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Mail>(query);
-    //setSourceModel(mModel.data());
+    mModel = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Folder>(query);
+    setSourceModel(mModel.data());
 }
 
 FolderListModel::~FolderListModel()
diff --git a/framework/mail/mailplugin.cpp b/framework/mail/mailplugin.cpp
index e5988591..b2939acf 100644
--- a/framework/mail/mailplugin.cpp
+++ b/framework/mail/mailplugin.cpp
@@ -12,7 +12,6 @@
 void MailPlugin::registerTypes (const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("org.kde.akonadi2.mail"));
-    qmlRegisterType<QAbstractItemModel>();
 
     qmlRegisterType<FolderListModel>();
     qmlRegisterType<FolderListController>(uri, 1, 0, "FolderList");