From bf327e5b8c6c680db2a0413eb90e2a276b7fa581 Mon Sep 17 00:00:00 2001
From: Simon Redman <simon@ergotech.com>
Date: Tue, 27 Mar 2018 17:09:57 +0200
Subject: [PATCH] Reduce dependencies of smsapp to kirigami 2.2

---
 smsapp/qml/ContactList.qml         | 2 +-
 smsapp/qml/ConversationDisplay.qml | 6 +++---
 smsapp/qml/main.qml                | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/smsapp/qml/ContactList.qml b/smsapp/qml/ContactList.qml
index babf418a4..c269ca3b2 100644
--- a/smsapp/qml/ContactList.qml
+++ b/smsapp/qml/ContactList.qml
@@ -23,7 +23,7 @@ import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 import org.kde.people 1.0
 import org.kde.plasma.core 2.0 as Core
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.2 as Kirigami
 import org.kde.kdeconnect 1.0
 
 Kirigami.ScrollablePage
diff --git a/smsapp/qml/ConversationDisplay.qml b/smsapp/qml/ConversationDisplay.qml
index b97508033..c89959671 100644
--- a/smsapp/qml/ConversationDisplay.qml
+++ b/smsapp/qml/ConversationDisplay.qml
@@ -21,7 +21,7 @@
 import QtQuick 2.1
 import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
-import org.kde.kirigami 2.4 as Kirigami
+import org.kde.kirigami 2.2 as Kirigami
 
 Kirigami.ScrollablePage
 {
@@ -33,7 +33,7 @@ Kirigami.ScrollablePage
 
     readonly property QtObject telephony: TelephonyDbusInterfaceFactory.create(device.id())
 
-    Kirigami.CardsListView {
+    ListView {
         model: ListModel {
             ListElement { display: "aaa"; fromMe: true }
             ListElement { display: "aaa" }
@@ -42,7 +42,7 @@ Kirigami.ScrollablePage
             ListElement { display: "aaa" }
             ListElement { display: "aaa" }
         }
-        delegate: Kirigami.AbstractCard {
+        delegate: Kirigami.BasicListItem {
             readonly property real margin: 100
             x: fromMe ? Kirigami.Units.gridUnit : margin
             width: parent.width - margin - Kirigami.Units.gridUnit
diff --git a/smsapp/qml/main.qml b/smsapp/qml/main.qml
index f7bdf4465..2645b0f8c 100644
--- a/smsapp/qml/main.qml
+++ b/smsapp/qml/main.qml
@@ -19,8 +19,7 @@
  */
 
 import QtQuick 2.1
-import QtQuick.Controls 2.3
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami 2.2 as Kirigami
  
 Kirigami.ApplicationWindow
 {