Accounts without kpackage

9 files changed, 8 insertions, 18 deletions

diff --git a/accounts/CMakeLists.txt b/accounts/CMakeLists.txt
index e14fda4e..26a45a0a 100644
--- a/accounts/CMakeLists.txt
+++ b/accounts/CMakeLists.txt
@@ -1,12 +1,13 @@
 include_directories(../framework/src/)
 
 find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Qml)
-
 find_package(Sink CONFIG REQUIRED)
 find_package(KAsync CONFIG REQUIRED)
-find_package(KF5 REQUIRED COMPONENTS Package Mime)
 
-include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/)
+macro(install_qml_account name)
+    install(DIRECTORY package/contents/ui/ DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/${name})
+    install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/${name})
+endmacro(install_qml_account)
 
 add_subdirectory(maildir)
 add_subdirectory(imap)
diff --git a/accounts/gmail/CMakeLists.txt b/accounts/gmail/CMakeLists.txt
index 5be1b134..42b95a45 100644
--- a/accounts/gmail/CMakeLists.txt
+++ b/accounts/gmail/CMakeLists.txt
@@ -14,7 +14,5 @@ target_link_libraries(gmailaccountplugin
     Qt5::Qml
 )
 
-kpackage_install_package(package org.kube.accounts.gmail "genericqml")
-
 install(TARGETS gmailaccountplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/gmail)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/gmail)
+install_qml_account(gmail)
diff --git a/accounts/gmail/package/contents/ui/GmailSettings.qml b/accounts/gmail/package/contents/ui/AccountSettings.qml
index 16f7dbf3..16f7dbf3 100644
--- a/accounts/gmail/package/contents/ui/GmailSettings.qml
+++ b/accounts/gmail/package/contents/ui/AccountSettings.qml
diff --git a/accounts/imap/CMakeLists.txt b/accounts/imap/CMakeLists.txt
index 5bd25a93..97399490 100644
--- a/accounts/imap/CMakeLists.txt
+++ b/accounts/imap/CMakeLists.txt
@@ -4,9 +4,6 @@ find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Qml)
 
 find_package(Sink CONFIG REQUIRED)
 find_package(KAsync CONFIG REQUIRED)
-find_package(KF5 REQUIRED COMPONENTS Package Mime)
-
-include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/)
 
 set(SRCS
     imapsettings.cpp
@@ -22,7 +19,5 @@ target_link_libraries(imapaccountplugin
     Qt5::Qml
 )
 
-kpackage_install_package(package org.kube.accounts.imap "genericqml")
-
 install(TARGETS imapaccountplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/imap)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/imap)
+install_qml_account(imap)
diff --git a/accounts/imap/package/contents/ui/ImapAccountSettings.qml b/accounts/imap/package/contents/ui/AccountSettings.qml
index d81f9c54..d81f9c54 100644
--- a/accounts/imap/package/contents/ui/ImapAccountSettings.qml
+++ b/accounts/imap/package/contents/ui/AccountSettings.qml
diff --git a/accounts/kolabnow/CMakeLists.txt b/accounts/kolabnow/CMakeLists.txt
index fd168537..92beab1c 100644
--- a/accounts/kolabnow/CMakeLists.txt
+++ b/accounts/kolabnow/CMakeLists.txt
@@ -14,7 +14,5 @@ target_link_libraries(kolabnowaccountplugin
     Qt5::Qml
 )
 
-kpackage_install_package(package org.kube.accounts.kolabnow "genericqml")
-
 install(TARGETS kolabnowaccountplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/kolabnow)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/kolabnow)
+install_qml_account(kolabnow)
diff --git a/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml b/accounts/kolabnow/package/contents/ui/AccountSettings.qml
index 4161bc49..4161bc49 100644
--- a/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml
+++ b/accounts/kolabnow/package/contents/ui/AccountSettings.qml
diff --git a/accounts/maildir/CMakeLists.txt b/accounts/maildir/CMakeLists.txt
index dc0f02fe..c396b6ba 100644
--- a/accounts/maildir/CMakeLists.txt
+++ b/accounts/maildir/CMakeLists.txt
@@ -14,7 +14,5 @@ target_link_libraries(maildiraccountplugin
     Qt5::Qml
 )
 
-kpackage_install_package(package org.kube.accounts.maildir "genericqml")
-
 install(TARGETS maildiraccountplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/maildir)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/maildir)
+install_qml_account(maildir)
diff --git a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml b/accounts/maildir/package/contents/ui/AccountSettings.qml
index 0fb87810..0fb87810 100644
--- a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml
+++ b/accounts/maildir/package/contents/ui/AccountSettings.qml