From 6090d00251ce8cb192a564d74dab91c735e6745f Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Tue, 12 Jan 2021 15:03:39 +0100
Subject: [PATCH] Revert "Update QtQuick versions to match Qt 5.10"

This reverts commit 74e32dd96b8ed04d46802226551e72b68ab17e48.
---
 .ci/format.sh                                             | 6 ------
 resources/qml/Avatar.qml                                  | 2 +-
 resources/qml/Completer.qml                               | 4 ++--
 resources/qml/EncryptionIndicator.qml                     | 4 ++--
 resources/qml/ImageButton.qml                             | 2 +-
 resources/qml/MatrixText.qml                              | 2 +-
 resources/qml/MessageInput.qml                            | 6 +++---
 resources/qml/MessageView.qml                             | 6 +++---
 resources/qml/NhekoBusyIndicator.qml                      | 4 ++--
 resources/qml/Reactions.qml                               | 4 ++--
 resources/qml/ReplyPopup.qml                              | 4 ++--
 resources/qml/ScrollHelper.qml                            | 2 +-
 resources/qml/StatusIndicator.qml                         | 4 ++--
 resources/qml/TimelineRow.qml                             | 6 +++---
 resources/qml/TimelineView.qml                            | 6 +++---
 resources/qml/TopBar.qml                                  | 4 ++--
 resources/qml/TypingIndicator.qml                         | 4 ++--
 resources/qml/UserProfile.qml                             | 6 +++---
 resources/qml/delegates/FileMessage.qml                   | 4 ++--
 resources/qml/delegates/ImageMessage.qml                  | 2 +-
 resources/qml/delegates/MessageDelegate.qml               | 2 +-
 resources/qml/delegates/Pill.qml                          | 2 +-
 resources/qml/delegates/PlayableMediaMessage.qml          | 8 ++++----
 resources/qml/delegates/Reply.qml                         | 6 +++---
 .../AwaitingVerificationConfirmation.qml                  | 4 ++--
 resources/qml/device-verification/DeviceVerification.qml  | 2 +-
 resources/qml/device-verification/DigitVerification.qml   | 4 ++--
 resources/qml/device-verification/EmojiElement.qml        | 4 ++--
 resources/qml/device-verification/EmojiVerification.qml   | 4 ++--
 resources/qml/device-verification/Failed.qml              | 4 ++--
 .../qml/device-verification/NewVerificationRequest.qml    | 4 ++--
 resources/qml/device-verification/Success.qml             | 4 ++--
 resources/qml/device-verification/Waiting.qml             | 4 ++--
 resources/qml/emoji/EmojiButton.qml                       | 2 +-
 resources/qml/emoji/EmojiPicker.qml                       | 4 ++--
 resources/qml/voip/ActiveCallBar.qml                      | 4 ++--
 resources/qml/voip/CallDevices.qml                        | 4 ++--
 resources/qml/voip/CallInviteBar.qml                      | 4 ++--
 resources/qml/voip/DeviceError.qml                        | 4 ++--
 resources/qml/voip/PlaceCall.qml                          | 4 ++--
 resources/qml/voip/VideoCall.qml                          | 2 +-
 41 files changed, 78 insertions(+), 84 deletions(-)

diff --git a/.ci/format.sh b/.ci/format.sh
index eaa995b8..e1e6c1e4 100755
--- a/.ci/format.sh
+++ b/.ci/format.sh
@@ -8,16 +8,10 @@
 set -eu
 
 FILES=$(find src -type f -type f \( -iname "*.cpp" -o -iname "*.h" \))
-QML_FILES=$(find resources -type f -iname "*.qml")
 
 for f in $FILES
 do
     clang-format -i "$f"
 done;
 
-for f in $QML_FILES
-do
-    qmlformat -i $f
-done;
-
 git diff --exit-code
diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml
index ea78095c..a459fe5a 100644
--- a/resources/qml/Avatar.qml
+++ b/resources/qml/Avatar.qml
@@ -1,6 +1,6 @@
 import "./ui"
 import QtGraphicalEffects 1.0
-import QtQuick 2.10
+import QtQuick 2.6
 import QtQuick.Controls 2.3
 import im.nheko 1.0
 
diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml
index de1b147f..ff342be5 100644
--- a/resources/qml/Completer.qml
+++ b/resources/qml/Completer.qml
@@ -1,7 +1,7 @@
 import "./ui"
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
+import QtQuick.Layouts 1.2
 import im.nheko 1.0
 
 Popup {
diff --git a/resources/qml/EncryptionIndicator.qml b/resources/qml/EncryptionIndicator.qml
index 95a8a8d6..46ca62c5 100644
--- a/resources/qml/EncryptionIndicator.qml
+++ b/resources/qml/EncryptionIndicator.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.5
+import QtQuick.Controls 2.1
 import im.nheko 1.0
 
 Rectangle {
diff --git a/resources/qml/ImageButton.qml b/resources/qml/ImageButton.qml
index 7157456d..b5a34b7b 100644
--- a/resources/qml/ImageButton.qml
+++ b/resources/qml/ImageButton.qml
@@ -1,5 +1,5 @@
 import "./ui"
-import QtQuick 2.10
+import QtQuick 2.3
 import QtQuick.Controls 2.3
 
 AbstractButton {
diff --git a/resources/qml/MatrixText.qml b/resources/qml/MatrixText.qml
index 020dd326..bb3b4296 100644
--- a/resources/qml/MatrixText.qml
+++ b/resources/qml/MatrixText.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.10
+import QtQuick 2.5
 import QtQuick.Controls 2.3
 import im.nheko 1.0
 
diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml
index 84b759db..0090ea95 100644
--- a/resources/qml/MessageInput.qml
+++ b/resources/qml/MessageInput.qml
@@ -1,8 +1,8 @@
 import "./voip"
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
-import QtQuick.Window 2.10
+import QtQuick.Layouts 1.2
+import QtQuick.Window 2.2
 import im.nheko 1.0
 
 Rectangle {
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 3717b945..7799dbf7 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -1,9 +1,9 @@
 import "./delegates"
 import QtGraphicalEffects 1.0
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
-import QtQuick.Window 2.10
+import QtQuick.Layouts 1.2
+import QtQuick.Window 2.2
 import im.nheko 1.0
 
 ListView {
diff --git a/resources/qml/NhekoBusyIndicator.qml b/resources/qml/NhekoBusyIndicator.qml
index 8384f363..89a40dd5 100644
--- a/resources/qml/NhekoBusyIndicator.qml
+++ b/resources/qml/NhekoBusyIndicator.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
+import QtQuick.Layouts 1.2
 
 BusyIndicator {
     id: control
diff --git a/resources/qml/Reactions.qml b/resources/qml/Reactions.qml
index 45ff3293..836087ef 100644
--- a/resources/qml/Reactions.qml
+++ b/resources/qml/Reactions.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.6
+import QtQuick.Controls 2.2
 import im.nheko 1.0
 
 // This class is for showing Reactions in the timeline row, not for
diff --git a/resources/qml/ReplyPopup.qml b/resources/qml/ReplyPopup.qml
index 9aa66daa..4659e075 100644
--- a/resources/qml/ReplyPopup.qml
+++ b/resources/qml/ReplyPopup.qml
@@ -1,7 +1,7 @@
 import "./delegates/"
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
+import QtQuick.Layouts 1.2
 import im.nheko 1.0
 
 Rectangle {
diff --git a/resources/qml/ScrollHelper.qml b/resources/qml/ScrollHelper.qml
index e5e671f0..7dc31464 100644
--- a/resources/qml/ScrollHelper.qml
+++ b/resources/qml/ScrollHelper.qml
@@ -28,7 +28,7 @@
 * qquickwheelarea.cpp in qtquickcontrols
 */
 
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
 
 MouseArea {
diff --git a/resources/qml/StatusIndicator.qml b/resources/qml/StatusIndicator.qml
index eda7d303..0b18b888 100644
--- a/resources/qml/StatusIndicator.qml
+++ b/resources/qml/StatusIndicator.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.5
+import QtQuick.Controls 2.1
 import im.nheko 1.0
 
 Rectangle {
diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index 1f9e03e7..57fded90 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -1,9 +1,9 @@
 import "./delegates"
 import "./emoji"
-import QtQuick 2.10
+import QtQuick 2.6
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
-import QtQuick.Window 2.10
+import QtQuick.Layouts 1.2
+import QtQuick.Window 2.2
 import im.nheko 1.0
 
 Item {
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 296a5a1d..e596d8e2 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -3,10 +3,10 @@ import "./device-verification"
 import "./emoji"
 import "./voip"
 import QtGraphicalEffects 1.0
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
-import QtQuick.Window 2.10
+import QtQuick.Layouts 1.3
+import QtQuick.Window 2.2
 import im.nheko 1.0
 import im.nheko.EmojiModel 1.0
 
diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml
index 7a3a9f12..273ed8ab 100644
--- a/resources/qml/TopBar.qml
+++ b/resources/qml/TopBar.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
+import QtQuick.Layouts 1.2
 import im.nheko 1.0
 
 Rectangle {
diff --git a/resources/qml/TypingIndicator.qml b/resources/qml/TypingIndicator.qml
index 46e30671..239fd662 100644
--- a/resources/qml/TypingIndicator.qml
+++ b/resources/qml/TypingIndicator.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
+import QtQuick.Layouts 1.2
 import im.nheko 1.0
 
 Item {
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml
index baff991e..410875ac 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -1,8 +1,8 @@
 import "./device-verification"
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
-import QtQuick.Window 2.10
+import QtQuick.Layouts 1.2
+import QtQuick.Window 2.3
 import im.nheko 1.0
 
 ApplicationWindow {
diff --git a/resources/qml/delegates/FileMessage.qml b/resources/qml/delegates/FileMessage.qml
index a15c36c3..ffd1e82b 100644
--- a/resources/qml/delegates/FileMessage.qml
+++ b/resources/qml/delegates/FileMessage.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.10
-import QtQuick.Layouts 1.10
+import QtQuick 2.6
+import QtQuick.Layouts 1.2
 import im.nheko 1.0
 
 Item {
diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml
index 9029bae6..e8e325f0 100644
--- a/resources/qml/delegates/ImageMessage.qml
+++ b/resources/qml/delegates/ImageMessage.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.10
+import QtQuick 2.6
 import im.nheko 1.0
 
 Item {
diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml
index f9510d03..816ab183 100644
--- a/resources/qml/delegates/MessageDelegate.qml
+++ b/resources/qml/delegates/MessageDelegate.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.10
+import QtQuick 2.6
 import im.nheko 1.0
 
 Item {
diff --git a/resources/qml/delegates/Pill.qml b/resources/qml/delegates/Pill.qml
index d7616962..88f6c7fd 100644
--- a/resources/qml/delegates/Pill.qml
+++ b/resources/qml/delegates/Pill.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.10
+import QtQuick 2.5
 import QtQuick.Controls 2.1
 
 Label {
diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index fe617f58..be22687f 100644
--- a/resources/qml/delegates/PlayableMediaMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -1,7 +1,7 @@
-import QtMultimedia 5.10
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
+import QtMultimedia 5.6
+import QtQuick 2.6
+import QtQuick.Controls 2.1
+import QtQuick.Layouts 1.2
 import im.nheko 1.0
 
 Rectangle {
diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml
index cb872428..fe2fe23f 100644
--- a/resources/qml/delegates/Reply.qml
+++ b/resources/qml/delegates/Reply.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.10
+import QtQuick 2.6
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
-import QtQuick.Window 2.10
+import QtQuick.Layouts 1.2
+import QtQuick.Window 2.2
 import im.nheko 1.0
 
 Item {
diff --git a/resources/qml/device-verification/AwaitingVerificationConfirmation.qml b/resources/qml/device-verification/AwaitingVerificationConfirmation.qml
index 3a143e1a..42bd68df 100644
--- a/resources/qml/device-verification/AwaitingVerificationConfirmation.qml
+++ b/resources/qml/device-verification/AwaitingVerificationConfirmation.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.3
+import QtQuick.Controls 2.10
 import QtQuick.Layouts 1.10
 import im.nheko 1.0
 
diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml
index 93cbc9bd..5009cc3a 100644
--- a/resources/qml/device-verification/DeviceVerification.qml
+++ b/resources/qml/device-verification/DeviceVerification.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick.Controls 2.10
 import QtQuick.Window 2.10
 import im.nheko 1.0
 
diff --git a/resources/qml/device-verification/DigitVerification.qml b/resources/qml/device-verification/DigitVerification.qml
index 29b933d9..11c32d26 100644
--- a/resources/qml/device-verification/DigitVerification.qml
+++ b/resources/qml/device-verification/DigitVerification.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.3
+import QtQuick.Controls 2.10
 import QtQuick.Layouts 1.10
 import im.nheko 1.0
 
diff --git a/resources/qml/device-verification/EmojiElement.qml b/resources/qml/device-verification/EmojiElement.qml
index 511e9a86..73ad1c9b 100644
--- a/resources/qml/device-verification/EmojiElement.qml
+++ b/resources/qml/device-verification/EmojiElement.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.3
+import QtQuick.Controls 2.10
 import QtQuick.Layouts 1.10
 
 Rectangle {
diff --git a/resources/qml/device-verification/EmojiVerification.qml b/resources/qml/device-verification/EmojiVerification.qml
index 3cf899ea..6ac340e4 100644
--- a/resources/qml/device-verification/EmojiVerification.qml
+++ b/resources/qml/device-verification/EmojiVerification.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.3
+import QtQuick.Controls 2.10
 import QtQuick.Layouts 1.10
 import im.nheko 1.0
 
diff --git a/resources/qml/device-verification/Failed.qml b/resources/qml/device-verification/Failed.qml
index c37c177b..5f9a2859 100644
--- a/resources/qml/device-verification/Failed.qml
+++ b/resources/qml/device-verification/Failed.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.3
+import QtQuick.Controls 2.10
 import QtQuick.Layouts 1.10
 import im.nheko 1.0
 
diff --git a/resources/qml/device-verification/NewVerificationRequest.qml b/resources/qml/device-verification/NewVerificationRequest.qml
index a34038a9..89e34b15 100644
--- a/resources/qml/device-verification/NewVerificationRequest.qml
+++ b/resources/qml/device-verification/NewVerificationRequest.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.3
+import QtQuick.Controls 2.10
 import QtQuick.Layouts 1.10
 import im.nheko 1.0
 
diff --git a/resources/qml/device-verification/Success.qml b/resources/qml/device-verification/Success.qml
index 66a53fb7..175f7524 100644
--- a/resources/qml/device-verification/Success.qml
+++ b/resources/qml/device-verification/Success.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.3
+import QtQuick.Controls 2.10
 import QtQuick.Layouts 1.10
 
 Pane {
diff --git a/resources/qml/device-verification/Waiting.qml b/resources/qml/device-verification/Waiting.qml
index e191597b..c64c90de 100644
--- a/resources/qml/device-verification/Waiting.qml
+++ b/resources/qml/device-verification/Waiting.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.3
+import QtQuick.Controls 2.10
 import QtQuick.Layouts 1.10
 import im.nheko 1.0
 
diff --git a/resources/qml/emoji/EmojiButton.qml b/resources/qml/emoji/EmojiButton.qml
index 586db47f..928d6226 100644
--- a/resources/qml/emoji/EmojiButton.qml
+++ b/resources/qml/emoji/EmojiButton.qml
@@ -1,6 +1,6 @@
 import "../"
 import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick.Controls 2.1
 import im.nheko 1.0
 import im.nheko.EmojiModel 1.0
 
diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml
index 91a927be..e0e1ceaf 100644
--- a/resources/qml/emoji/EmojiPicker.qml
+++ b/resources/qml/emoji/EmojiPicker.qml
@@ -1,8 +1,8 @@
 import "../"
 import QtGraphicalEffects 1.0
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
+import QtQuick.Layouts 1.3
 import im.nheko 1.0
 import im.nheko.EmojiModel 1.0
 
diff --git a/resources/qml/voip/ActiveCallBar.qml b/resources/qml/voip/ActiveCallBar.qml
index a0a86407..949ba277 100644
--- a/resources/qml/voip/ActiveCallBar.qml
+++ b/resources/qml/voip/ActiveCallBar.qml
@@ -1,7 +1,7 @@
 import "../"
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
+import QtQuick.Layouts 1.2
 import im.nheko 1.0
 
 Rectangle {
diff --git a/resources/qml/voip/CallDevices.qml b/resources/qml/voip/CallDevices.qml
index 6a40175a..8b30c540 100644
--- a/resources/qml/voip/CallDevices.qml
+++ b/resources/qml/voip/CallDevices.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
+import QtQuick.Layouts 1.2
 import im.nheko 1.0
 
 Popup {
diff --git a/resources/qml/voip/CallInviteBar.qml b/resources/qml/voip/CallInviteBar.qml
index 376337d8..5c4b8f32 100644
--- a/resources/qml/voip/CallInviteBar.qml
+++ b/resources/qml/voip/CallInviteBar.qml
@@ -1,7 +1,7 @@
 import "../"
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
+import QtQuick.Layouts 1.2
 import im.nheko 1.0
 
 Rectangle {
diff --git a/resources/qml/voip/DeviceError.qml b/resources/qml/voip/DeviceError.qml
index a095d31e..81872ef7 100644
--- a/resources/qml/voip/DeviceError.qml
+++ b/resources/qml/voip/DeviceError.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
+import QtQuick.Layouts 1.2
 import im.nheko 1.0
 
 Popup {
diff --git a/resources/qml/voip/PlaceCall.qml b/resources/qml/voip/PlaceCall.qml
index 12fbf838..526f056e 100644
--- a/resources/qml/voip/PlaceCall.qml
+++ b/resources/qml/voip/PlaceCall.qml
@@ -1,7 +1,7 @@
 import "../"
-import QtQuick 2.10
+import QtQuick 2.9
 import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.10
+import QtQuick.Layouts 1.2
 import im.nheko 1.0
 
 Popup {
diff --git a/resources/qml/voip/VideoCall.qml b/resources/qml/voip/VideoCall.qml
index 17a78773..14408b6e 100644
--- a/resources/qml/voip/VideoCall.qml
+++ b/resources/qml/voip/VideoCall.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.10
+import QtQuick 2.9
 import org.freedesktop.gstreamer.GLVideoItem 1.0
 
 GstGLVideoItem {