From a846741b8bce911174c6b4b9becc7fcb9a83660c Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 17 Feb 2016 13:05:08 +0100
Subject: Fixed KPackage loading

---
 applications/kube-mail/CMakeLists.txt | 2 +-
 applications/kube-mail/main.cpp       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'applications/kube-mail')

diff --git a/applications/kube-mail/CMakeLists.txt b/applications/kube-mail/CMakeLists.txt
index 05c98d18..412f835c 100644
--- a/applications/kube-mail/CMakeLists.txt
+++ b/applications/kube-mail/CMakeLists.txt
@@ -23,7 +23,7 @@ set (QT_MIN_VERSION "5.4.0")
 find_package(KF5 REQUIRED COMPONENTS Package)
 
 # install UI package
-kpackage_install_package(package org.kde.kube.mail pim)
+kpackage_install_package(package org.kde.kube.mail "genericqml")
 
 # install executable
 add_executable(${PROJECT_NAME} main.cpp)
diff --git a/applications/kube-mail/main.cpp b/applications/kube-mail/main.cpp
index 400cba82..0e9556c9 100644
--- a/applications/kube-mail/main.cpp
+++ b/applications/kube-mail/main.cpp
@@ -2,13 +2,15 @@
 #include <QQmlApplicationEngine>
 
 #include <QStandardPaths>
+#include <KPackage/PackageLoader>
 
 #include <QDebug>
 
 int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
-    auto mainFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kpackage/pim/org.kde.kube.mail/contents/ui/main.qml", QStandardPaths::LocateFile);
-    QQmlApplicationEngine engine(QUrl::fromLocalFile(mainFile));
+    auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kde.kube.mail");
+    Q_ASSERT(package.isValid());
+    QQmlApplicationEngine engine(QUrl::fromLocalFile(package.filePath("mainscript")));
     return app.exec();
 }
-- 
cgit v1.2.3