Merge branch 'kirigamiPort' of https://github.com/sebasje/subsurface into mergeKirigamiPort

This merge was a bit more challenging given how far things had diverged,
but I hope I got it mostly right.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/qt-mobile/qml/CloudCredentials.qml b/qt-mobile/qml/CloudCredentials.qml
index 07de055fa..4f1484ce8 100644
--- a/qt-mobile/qml/CloudCredentials.qml
+++ b/qt-mobile/qml/CloudCredentials.qml
@@ -3,12 +3,12 @@ import QtQuick.Controls 1.2
 import QtQuick.Window 2.2
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.1
-import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
+import org.kde.kirigami 1.0 as Kirigami
 import org.subsurfacedivelog.mobile 1.0
 
 Item {
 	id: loginWindow
-	height: outerLayout.height + 2 * MobileComponents.Units.gridUnit
+	height: outerLayout.height + 2 * Kirigami.Units.gridUnit
 
 	property string username: login.text;
 	property string password: password.text;
@@ -21,7 +21,7 @@ Item {
 
 	ColumnLayout {
 		id: outerLayout
-		width: subsurfaceTheme.columnWidth - 2 * MobileComponents.Units.gridUnit
+		width: subsurfaceTheme.columnWidth - 2 * Kirigami.Units.gridUnit
 
 		onVisibleChanged: {
 			if (visible) {
@@ -34,13 +34,13 @@ Item {
 			}
 		}
 
-		MobileComponents.Heading {
+		Kirigami.Heading {
 			text: "Cloud credentials"
 			level: headingLevel
-			Layout.bottomMargin: MobileComponents.Units.largeSpacing / 2
+			Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
 		}
 
-		MobileComponents.Label {
+		Kirigami.Label {
 			text: "Email"
 		}
 
@@ -52,7 +52,7 @@ Item {
 					  Qt.ImhNoAutoUppercase
 		}
 
-		MobileComponents.Label {
+		Kirigami.Label {
 			text: "Password"
 		}
 
@@ -75,10 +75,10 @@ Item {
 					password.echoMode = checked ? TextInput.Normal : TextInput.Password
 				}
 			}
-			MobileComponents.Label {
+			Kirigami.Label {
 				text: "Show password"
 			}
 		}
-		Item { width: MobileComponents.Units.gridUnit; height: width }
+		Item { width: Kirigami.Units.gridUnit; height: width }
 	}
 }