12 files changed, 2 insertions, 35 deletions

diff --git a/accounts/CMakeLists.txt b/accounts/CMakeLists.txt
index 26a45a0a..bf116942 100644
--- a/accounts/CMakeLists.txt
+++ b/accounts/CMakeLists.txt
@@ -5,7 +5,7 @@ find_package(Sink CONFIG REQUIRED)
 find_package(KAsync CONFIG REQUIRED)
 
 macro(install_qml_account name)
-    install(DIRECTORY package/contents/ui/ DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/${name})
+    install(DIRECTORY qml/ DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/${name})
     install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/${name})
 endmacro(install_qml_account)
 
diff --git a/accounts/gmail/package/metadata.desktop b/accounts/gmail/package/metadata.desktop
deleted file mode 100644
index e2b71ec9..00000000
--- a/accounts/gmail/package/metadata.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Kube GMail Accounts Plugin
-X-KDE-PluginInfo-Name=org.kube.accounts.gmail
-Exec=kpackagelauncherqml -a org.kube.accounts.gmail
-X-Plasma-MainScript=ui/GmailSettings.qml
-X-KDE-ServiceTypes=KPackage/GenericQML
-Icon=folder
-Type=Service
diff --git a/accounts/gmail/package/contents/ui/AccountSettings.qml b/accounts/gmail/qml/AccountSettings.qml
index 16f7dbf3..16f7dbf3 100644
--- a/accounts/gmail/package/contents/ui/AccountSettings.qml
+++ b/accounts/gmail/qml/AccountSettings.qml
diff --git a/accounts/imap/package/metadata.desktop b/accounts/imap/package/metadata.desktop
deleted file mode 100644
index 7c4320c3..00000000
--- a/accounts/imap/package/metadata.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Kube Imap Accounts Plugin
-X-KDE-PluginInfo-Name=org.kube.accounts.imap
-Exec=kpackagelauncherqml -a org.kube.accounts.imap
-X-Plasma-MainScript=ui/ImapAccountSettings.qml
-X-KDE-ServiceTypes=KPackage/GenericQML
-Icon=folder
-Type=Service
diff --git a/accounts/imap/package/contents/ui/AccountSettings.qml b/accounts/imap/qml/AccountSettings.qml
index d81f9c54..d81f9c54 100644
--- a/accounts/imap/package/contents/ui/AccountSettings.qml
+++ b/accounts/imap/qml/AccountSettings.qml
diff --git a/accounts/imap/package/contents/ui/Login.qml b/accounts/imap/qml/Login.qml
index 14e13e89..14e13e89 100644
--- a/accounts/imap/package/contents/ui/Login.qml
+++ b/accounts/imap/qml/Login.qml
diff --git a/accounts/kolabnow/package/metadata.desktop b/accounts/kolabnow/package/metadata.desktop
deleted file mode 100644
index 6777e2d1..00000000
--- a/accounts/kolabnow/package/metadata.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Kube Kolabnow Accounts Plugin
-X-KDE-PluginInfo-Name=org.kube.accounts.kolabnow
-Exec=kpackagelauncherqml -a org.kube.accounts.kolabnow
-X-Plasma-MainScript=ui/KolabnowAccountSettings.qml
-X-KDE-ServiceTypes=KPackage/GenericQML
-Icon=folder
-Type=Service
diff --git a/accounts/kolabnow/package/contents/ui/AccountSettings.qml b/accounts/kolabnow/qml/AccountSettings.qml
index 4161bc49..4161bc49 100644
--- a/accounts/kolabnow/package/contents/ui/AccountSettings.qml
+++ b/accounts/kolabnow/qml/AccountSettings.qml
diff --git a/accounts/kolabnow/package/contents/ui/Login.qml b/accounts/kolabnow/qml/Login.qml
index e416b089..e416b089 100644
--- a/accounts/kolabnow/package/contents/ui/Login.qml
+++ b/accounts/kolabnow/qml/Login.qml
diff --git a/accounts/maildir/package/metadata.desktop b/accounts/maildir/package/metadata.desktop
deleted file mode 100644
index ce922455..00000000
--- a/accounts/maildir/package/metadata.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Kube Maildir Accounts Plugin
-X-KDE-PluginInfo-Name=org.kube.accounts.maildir
-Exec=kpackagelauncherqml -a org.kube.accounts.maildir
-X-Plasma-MainScript=ui/MaildirAccountSettings.qml
-X-KDE-ServiceTypes=KPackage/GenericQML
-Icon=folder
-Type=Service
-X-KDE-Kube-RequiresKeyring=False
diff --git a/accounts/maildir/package/contents/ui/AccountSettings.qml b/accounts/maildir/qml/AccountSettings.qml
index 0fb87810..0fb87810 100644
--- a/accounts/maildir/package/contents/ui/AccountSettings.qml
+++ b/accounts/maildir/qml/AccountSettings.qml
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index ff001324..ed28b5f4 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -3,7 +3,7 @@ project(kube-components)
 find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets)
 
 macro(install_qml_component name)
-    install(DIRECTORY ${name}/contents/ui/ DESTINATION ${QML_INSTALL_DIR}/org/kube/components/${name})
+    install(DIRECTORY ${name}/qml/ DESTINATION ${QML_INSTALL_DIR}/org/kube/components/${name})
     install(FILES ${name}/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/components/${name})
 endmacro(install_qml_component)