Merge branch 'develop' of git://anongit.kde.org/kube into develop

3 files changed, 5 insertions, 7 deletions

diff --git a/components/package/contents/ui/Composer.qml b/components/package/contents/ui/Composer.qml
index 1bd96a2b..8c6f9c77 100644
--- a/components/package/contents/ui/Composer.qml
+++ b/components/package/contents/ui/Composer.qml
@@ -19,7 +19,6 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.0
-import org.kde.plasma.components 2.0 as PlasmaComponents
 
 import org.kube.framework.domain 1.0 as KubeFramework
 
diff --git a/components/package/contents/ui/FolderListView.qml b/components/package/contents/ui/FolderListView.qml
index f660846d..e41220f5 100644
--- a/components/package/contents/ui/FolderListView.qml
+++ b/components/package/contents/ui/FolderListView.qml
@@ -20,8 +20,7 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.1
 
-import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.kirigami 1.0 as Kirigami
 
 import org.kube.framework.domain 1.0 as KubeFramework
 import org.kube.framework.theme 1.0
@@ -86,7 +85,7 @@ Item {
 
                 color: "#333"
                 border.color: Qt.lighter(color, 1.2)
-                PlasmaCore.IconItem {
+                Kirigami.Icon {
                     id: iconItem
                     anchors.left: parent.left
                     anchors.verticalCenter: parent.verticalCenter
@@ -155,7 +154,7 @@ Item {
                                 border.width: 1
                                 border.color: "lightgrey"
                                 color: styleData.selected ? colorPalette.highlight : colorPalette.button
-                                PlasmaCore.IconItem {
+                                Kirigami.Icon {
                                     id: iconItem
                                     anchors {
                                         verticalCenter: parent.verticalCenter
diff --git a/components/package/contents/ui/Settings.qml b/components/package/contents/ui/Settings.qml
index fa646372..2ee6c859 100644
--- a/components/package/contents/ui/Settings.qml
+++ b/components/package/contents/ui/Settings.qml
@@ -19,7 +19,7 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.kirigami 1.0 as Kirigami
 import org.kde.plasma.components  2.0 as PlasmaComponents
 
 import org.kube.framework.settings 1.0 as KubeSettings
@@ -114,7 +114,7 @@ Rectangle {
                             RowLayout {
                                 anchors.fill: parent
 
-                                PlasmaCore.IconItem {
+                                Kirigami.Icon {
                                     source: accountFactory.icon
                                 }