diff --git a/containment/package/contents/ui/applet/communicator/Engine.qml b/containment/package/contents/ui/applet/communicator/Engine.qml index b08a7bbc9..6477694d7 100644 --- a/containment/package/contents/ui/applet/communicator/Engine.qml +++ b/containment/package/contents/ui/applet/communicator/Engine.qml @@ -19,7 +19,7 @@ import QtQuick 2.7 -import org.kde.latte.container.abilities 0.1 as ContainerAbility +import org.kde.latte.containers.abilities 0.1 as ContainerAbility import "../../../code/AppletIdentifier.js" as AppletIdentifier diff --git a/declarativeimports/CMakeLists.txt b/declarativeimports/CMakeLists.txt index 13d4c12f2..d07bf1dd4 100644 --- a/declarativeimports/CMakeLists.txt +++ b/declarativeimports/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(core) -install(DIRECTORY applet/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/applet) +install(DIRECTORY applets/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/applets) install(DIRECTORY components/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/components) -install(DIRECTORY container/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/container) +install(DIRECTORY containers/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte/containers) diff --git a/declarativeimports/applet/abilities/qmldir b/declarativeimports/applet/abilities/qmldir deleted file mode 100644 index 3b4b9e4f6..000000000 --- a/declarativeimports/applet/abilities/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -module org.kde.latte.applet.abilities - -Requirements 0.1 Requirements.qml diff --git a/declarativeimports/applet/abilities/Requirements.qml b/declarativeimports/applets/abilities/Requirements.qml similarity index 97% rename from declarativeimports/applet/abilities/Requirements.qml rename to declarativeimports/applets/abilities/Requirements.qml index 9b332467c..551d1fa30 100644 --- a/declarativeimports/applet/abilities/Requirements.qml +++ b/declarativeimports/applets/abilities/Requirements.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 -import org.kde.latte.container.abilities 0.1 as ContainerAbility +import org.kde.latte.containers.abilities 0.1 as ContainerAbility ContainerAbility.AppletRequirements{ id: requirements diff --git a/declarativeimports/applets/abilities/qmldir b/declarativeimports/applets/abilities/qmldir new file mode 100644 index 000000000..adb4dd686 --- /dev/null +++ b/declarativeimports/applets/abilities/qmldir @@ -0,0 +1,3 @@ +module org.kde.latte.applets.abilities + +Requirements 0.1 Requirements.qml diff --git a/declarativeimports/container/abilities/AppletRequirements.qml b/declarativeimports/containers/abilities/AppletRequirements.qml similarity index 100% rename from declarativeimports/container/abilities/AppletRequirements.qml rename to declarativeimports/containers/abilities/AppletRequirements.qml diff --git a/declarativeimports/container/abilities/qmldir b/declarativeimports/containers/abilities/qmldir similarity index 52% rename from declarativeimports/container/abilities/qmldir rename to declarativeimports/containers/abilities/qmldir index 1b679db7a..fff279be6 100644 --- a/declarativeimports/container/abilities/qmldir +++ b/declarativeimports/containers/abilities/qmldir @@ -1,3 +1,3 @@ -module org.kde.latte.container.abilities +module org.kde.latte.containers.abilities AppletRequirements 0.1 AppletRequirements.qml diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index 4b83b5d96..49aa42e04 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -33,7 +33,7 @@ import org.kde.activities 0.1 as Activities import org.kde.latte.core 0.2 as LatteCore import org.kde.latte.components 1.0 as LatteComponents -import org.kde.latte.applet.abilities 0.1 as AppletAbility +import org.kde.latte.applets.abilities 0.1 as AppletAbility import org.kde.latte.private.tasks 0.1 as LatteTasks