27 files changed, 10 insertions, 20 deletions

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 79a2f0c0..e0b64501 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -29,9 +29,6 @@ macro(install_component name)
     kpackage_install_package(${name} org.kube.components.${name} "genericqml")
 endmacro(install_component)
 
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/components)
-install(DIRECTORY package/contents/ui/ DESTINATION ${QML_INSTALL_DIR}/org/kube/components)
-
 install_component(mail)
 install_component(accounts)
 install_component(mailviewer)
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
index d14360b4..f097f658 100644
--- a/framework/CMakeLists.txt
+++ b/framework/CMakeLists.txt
@@ -33,6 +33,9 @@ enable_testing()
 
 set(SINK_RESOURCE_PLUGINS_PATH ${QT_PLUGIN_INSTALL_DIR}/sink/resources)
 
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework)
+install(DIRECTORY qml DESTINATION ${QML_INSTALL_DIR}/org/kube/framework)
+
 # The actions framework
 add_subdirectory(actions)
 # The settings framework
diff --git a/framework/accounts/qmldir b/framework/accounts/qmldir
deleted file mode 100644
index 662725de..00000000
--- a/framework/accounts/qmldir
+++ /dev/null
@@ -1,4 +0,0 @@
-module org.kube.framework.accounts
-
-plugin accountsplugin
-
diff --git a/framework/actions/qmldir b/framework/actions/qmldir
deleted file mode 100644
index f6dccbda..00000000
--- a/framework/actions/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-module org.kube.framework.actions
-
-plugin actionplugin
diff --git a/framework/domain/qmldir b/framework/domain/qmldir
deleted file mode 100644
index 54a3a98b..00000000
--- a/framework/domain/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-module org.kube.framework.domain
-
-plugin mailplugin
diff --git a/framework/notifications/qmldir b/framework/notifications/qmldir
deleted file mode 100644
index 4eaad10c..00000000
--- a/framework/notifications/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-module org.kube.framework.notifications
-
-plugin notificationplugin
diff --git a/components/package/contents/ui/AccountSwitcher.qml b/framework/qml/AccountSwitcher.qml
index 0cd91adc..0cd91adc 100644
--- a/components/package/contents/ui/AccountSwitcher.qml
+++ b/framework/qml/AccountSwitcher.qml
diff --git a/components/package/contents/ui/AttachmentDelegate.qml b/framework/qml/AttachmentDelegate.qml
index a589c9f3..a589c9f3 100644
--- a/components/package/contents/ui/AttachmentDelegate.qml
+++ b/framework/qml/AttachmentDelegate.qml
diff --git a/components/package/contents/ui/AutocompleteLineEdit.qml b/framework/qml/AutocompleteLineEdit.qml
index 64e5940f..64e5940f 100644
--- a/components/package/contents/ui/AutocompleteLineEdit.qml
+++ b/framework/qml/AutocompleteLineEdit.qml
diff --git a/components/package/contents/ui/Avatar.qml b/framework/qml/Avatar.qml
index 0a7c4c18..0a7c4c18 100644
--- a/components/package/contents/ui/Avatar.qml
+++ b/framework/qml/Avatar.qml
diff --git a/components/package/contents/ui/Button.qml b/framework/qml/Button.qml
index 948312b0..948312b0 100644
--- a/components/package/contents/ui/Button.qml
+++ b/framework/qml/Button.qml
diff --git a/components/package/contents/ui/ConversationView.qml b/framework/qml/ConversationView.qml
index 4196ebbd..4196ebbd 100644
--- a/components/package/contents/ui/ConversationView.qml
+++ b/framework/qml/ConversationView.qml
diff --git a/components/package/contents/ui/EditAccount.qml b/framework/qml/EditAccount.qml
index 8618ec91..8618ec91 100644
--- a/components/package/contents/ui/EditAccount.qml
+++ b/framework/qml/EditAccount.qml
diff --git a/components/package/contents/ui/EditAccountDialog.qml b/framework/qml/EditAccountDialog.qml
index a7461640..a7461640 100644
--- a/components/package/contents/ui/EditAccountDialog.qml
+++ b/framework/qml/EditAccountDialog.qml
diff --git a/components/package/contents/ui/FocusComposer.qml b/framework/qml/FocusComposer.qml
index 902309a8..902309a8 100644
--- a/components/package/contents/ui/FocusComposer.qml
+++ b/framework/qml/FocusComposer.qml
diff --git a/components/package/contents/ui/FolderListView.qml b/framework/qml/FolderListView.qml
index b35b52ed..b35b52ed 100644
--- a/components/package/contents/ui/FolderListView.qml
+++ b/framework/qml/FolderListView.qml
diff --git a/components/package/contents/ui/Icon.qml b/framework/qml/Icon.qml
index 74a4971a..74a4971a 100644
--- a/components/package/contents/ui/Icon.qml
+++ b/framework/qml/Icon.qml
diff --git a/components/package/contents/ui/ListItem.qml b/framework/qml/ListItem.qml
index 165ac3ab..165ac3ab 100644
--- a/components/package/contents/ui/ListItem.qml
+++ b/framework/qml/ListItem.qml
diff --git a/components/package/contents/ui/MailListView.qml b/framework/qml/MailListView.qml
index 2d5d6601..2d5d6601 100644
--- a/components/package/contents/ui/MailListView.qml
+++ b/framework/qml/MailListView.qml
diff --git a/components/package/contents/ui/MailViewer.qml b/framework/qml/MailViewer.qml
index 4ee170bd..4ee170bd 100644
--- a/components/package/contents/ui/MailViewer.qml
+++ b/framework/qml/MailViewer.qml
diff --git a/components/package/contents/ui/Notification.qml b/framework/qml/Notification.qml
index 15291c43..15291c43 100644
--- a/components/package/contents/ui/Notification.qml
+++ b/framework/qml/Notification.qml
diff --git a/components/package/contents/ui/Outbox.qml b/framework/qml/Outbox.qml
index 19646459..19646459 100644
--- a/components/package/contents/ui/Outbox.qml
+++ b/framework/qml/Outbox.qml
diff --git a/components/package/contents/ui/OverlayDialog.qml b/framework/qml/OverlayDialog.qml
index 760fb12e..760fb12e 100644
--- a/components/package/contents/ui/OverlayDialog.qml
+++ b/framework/qml/OverlayDialog.qml
diff --git a/components/package/contents/ui/People.qml b/framework/qml/People.qml
index 182cce94..182cce94 100644
--- a/components/package/contents/ui/People.qml
+++ b/framework/qml/People.qml
diff --git a/components/package/contents/ui/PositiveButton.qml b/framework/qml/PositiveButton.qml
index 83063668..83063668 100644
--- a/components/package/contents/ui/PositiveButton.qml
+++ b/framework/qml/PositiveButton.qml
diff --git a/components/qmldir b/framework/qmldir
index a1c09b87..f258f5cc 100644
--- a/components/qmldir
+++ b/framework/qmldir
@@ -1,4 +1,4 @@
-module org.kube.components
+module org.kube.framework
 
 Avatar 1.0 Avatar.qml
 FocusComposer 1.0 FocusComposer.qml
@@ -15,3 +15,9 @@ Notification 1.0 Notification.qml
 Icon 1.0 Icon.qml
 Button 1.0 Button.qml
 PositiveButton 1.0 PositiveButton.qml
+
+plugin mailplugin
+plugin actionplugin
+plugin notificationplugin
+plugin settingsplugin
+plugin accountsplugin
diff --git a/framework/settings/qmldir b/framework/settings/qmldir
deleted file mode 100644
index 22fec334..00000000
--- a/framework/settings/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-module org.kube.framework.settings
-
-plugin settingsplugin