summary refs log tree commit diff
path: root/resources
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2021-01-11 22:17:00 -0500
committerJoseph Donofry <joedonofry@gmail.com>2021-01-11 22:17:00 -0500
commit74e32dd96b8ed04d46802226551e72b68ab17e48 (patch)
tree7c6dc65db8c1f681d7f0c98bfaec483895a3c196 /resources
parentMerge branch 'master' of ssh://github.com/Nheko-Reborn/nheko (diff)
downloadnheko-74e32dd96b8ed04d46802226551e72b68ab17e48.tar.xz
Update QtQuick versions to match Qt 5.10
Diffstat (limited to 'resources')
-rw-r--r--resources/qml/Avatar.qml2
-rw-r--r--resources/qml/Completer.qml4
-rw-r--r--resources/qml/EncryptionIndicator.qml4
-rw-r--r--resources/qml/ImageButton.qml2
-rw-r--r--resources/qml/MatrixText.qml2
-rw-r--r--resources/qml/MessageInput.qml6
-rw-r--r--resources/qml/MessageView.qml6
-rw-r--r--resources/qml/NhekoBusyIndicator.qml4
-rw-r--r--resources/qml/Reactions.qml4
-rw-r--r--resources/qml/ReplyPopup.qml4
-rw-r--r--resources/qml/ScrollHelper.qml2
-rw-r--r--resources/qml/StatusIndicator.qml4
-rw-r--r--resources/qml/TimelineRow.qml6
-rw-r--r--resources/qml/TimelineView.qml6
-rw-r--r--resources/qml/TopBar.qml4
-rw-r--r--resources/qml/TypingIndicator.qml4
-rw-r--r--resources/qml/UserProfile.qml6
-rw-r--r--resources/qml/delegates/FileMessage.qml4
-rw-r--r--resources/qml/delegates/ImageMessage.qml2
-rw-r--r--resources/qml/delegates/MessageDelegate.qml2
-rw-r--r--resources/qml/delegates/Pill.qml2
-rw-r--r--resources/qml/delegates/PlayableMediaMessage.qml8
-rw-r--r--resources/qml/delegates/Reply.qml6
-rw-r--r--resources/qml/device-verification/AwaitingVerificationConfirmation.qml4
-rw-r--r--resources/qml/device-verification/DeviceVerification.qml2
-rw-r--r--resources/qml/device-verification/DigitVerification.qml4
-rw-r--r--resources/qml/device-verification/EmojiElement.qml4
-rw-r--r--resources/qml/device-verification/EmojiVerification.qml4
-rw-r--r--resources/qml/device-verification/Failed.qml4
-rw-r--r--resources/qml/device-verification/NewVerificationRequest.qml4
-rw-r--r--resources/qml/device-verification/Success.qml4
-rw-r--r--resources/qml/device-verification/Waiting.qml4
-rw-r--r--resources/qml/emoji/EmojiButton.qml2
-rw-r--r--resources/qml/emoji/EmojiPicker.qml4
-rw-r--r--resources/qml/voip/ActiveCallBar.qml4
-rw-r--r--resources/qml/voip/CallDevices.qml4
-rw-r--r--resources/qml/voip/CallInviteBar.qml4
-rw-r--r--resources/qml/voip/DeviceError.qml4
-rw-r--r--resources/qml/voip/PlaceCall.qml4
-rw-r--r--resources/qml/voip/VideoCall.qml2
40 files changed, 78 insertions, 78 deletions
diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml

index a459fe5a..ea78095c 100644 --- a/resources/qml/Avatar.qml +++ b/resources/qml/Avatar.qml
@@ -1,6 +1,6 @@ import "./ui" import QtGraphicalEffects 1.0 -import QtQuick 2.6 +import QtQuick 2.10 import QtQuick.Controls 2.3 import im.nheko 1.0 diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml
index ff342be5..de1b147f 100644 --- a/resources/qml/Completer.qml +++ b/resources/qml/Completer.qml
@@ -1,7 +1,7 @@ import "./ui" -import QtQuick 2.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.10 import im.nheko 1.0 Popup { diff --git a/resources/qml/EncryptionIndicator.qml b/resources/qml/EncryptionIndicator.qml
index 46ca62c5..95a8a8d6 100644 --- a/resources/qml/EncryptionIndicator.qml +++ b/resources/qml/EncryptionIndicator.qml
@@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import im.nheko 1.0 Rectangle { diff --git a/resources/qml/ImageButton.qml b/resources/qml/ImageButton.qml
index b5a34b7b..7157456d 100644 --- a/resources/qml/ImageButton.qml +++ b/resources/qml/ImageButton.qml
@@ -1,5 +1,5 @@ import "./ui" -import QtQuick 2.3 +import QtQuick 2.10 import QtQuick.Controls 2.3 AbstractButton { diff --git a/resources/qml/MatrixText.qml b/resources/qml/MatrixText.qml
index bb3b4296..020dd326 100644 --- a/resources/qml/MatrixText.qml +++ b/resources/qml/MatrixText.qml
@@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.10 import QtQuick.Controls 2.3 import im.nheko 1.0 diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml
index 0090ea95..84b759db 100644 --- a/resources/qml/MessageInput.qml +++ b/resources/qml/MessageInput.qml
@@ -1,8 +1,8 @@ import "./voip" -import QtQuick 2.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 -import QtQuick.Window 2.2 +import QtQuick.Layouts 1.10 +import QtQuick.Window 2.10 import im.nheko 1.0 Rectangle { diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 7799dbf7..3717b945 100644 --- a/resources/qml/MessageView.qml +++ b/resources/qml/MessageView.qml
@@ -1,9 +1,9 @@ import "./delegates" import QtGraphicalEffects 1.0 -import QtQuick 2.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 -import QtQuick.Window 2.2 +import QtQuick.Layouts 1.10 +import QtQuick.Window 2.10 import im.nheko 1.0 ListView { diff --git a/resources/qml/NhekoBusyIndicator.qml b/resources/qml/NhekoBusyIndicator.qml
index 89a40dd5..8384f363 100644 --- a/resources/qml/NhekoBusyIndicator.qml +++ b/resources/qml/NhekoBusyIndicator.qml
@@ -1,6 +1,6 @@ -import QtQuick 2.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.10 BusyIndicator { id: control diff --git a/resources/qml/Reactions.qml b/resources/qml/Reactions.qml
index 836087ef..45ff3293 100644 --- a/resources/qml/Reactions.qml +++ b/resources/qml/Reactions.qml
@@ -1,5 +1,5 @@ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.10 +import QtQuick.Controls 2.3 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 4659e075..9aa66daa 100644 --- a/resources/qml/ReplyPopup.qml +++ b/resources/qml/ReplyPopup.qml
@@ -1,7 +1,7 @@ import "./delegates/" -import QtQuick 2.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.10 import im.nheko 1.0 Rectangle { diff --git a/resources/qml/ScrollHelper.qml b/resources/qml/ScrollHelper.qml
index 7dc31464..e5e671f0 100644 --- a/resources/qml/ScrollHelper.qml +++ b/resources/qml/ScrollHelper.qml
@@ -28,7 +28,7 @@ * qquickwheelarea.cpp in qtquickcontrols */ -import QtQuick 2.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 MouseArea { diff --git a/resources/qml/StatusIndicator.qml b/resources/qml/StatusIndicator.qml
index 0b18b888..eda7d303 100644 --- a/resources/qml/StatusIndicator.qml +++ b/resources/qml/StatusIndicator.qml
@@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import im.nheko 1.0 Rectangle { diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index 57fded90..1f9e03e7 100644 --- a/resources/qml/TimelineRow.qml +++ b/resources/qml/TimelineRow.qml
@@ -1,9 +1,9 @@ import "./delegates" import "./emoji" -import QtQuick 2.6 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 -import QtQuick.Window 2.2 +import QtQuick.Layouts 1.10 +import QtQuick.Window 2.10 import im.nheko 1.0 Item { diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index e596d8e2..296a5a1d 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.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 -import QtQuick.Window 2.2 +import QtQuick.Layouts 1.10 +import QtQuick.Window 2.10 import im.nheko 1.0 import im.nheko.EmojiModel 1.0 diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml
index 273ed8ab..7a3a9f12 100644 --- a/resources/qml/TopBar.qml +++ b/resources/qml/TopBar.qml
@@ -1,6 +1,6 @@ -import QtQuick 2.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.10 import im.nheko 1.0 Rectangle { diff --git a/resources/qml/TypingIndicator.qml b/resources/qml/TypingIndicator.qml
index 239fd662..46e30671 100644 --- a/resources/qml/TypingIndicator.qml +++ b/resources/qml/TypingIndicator.qml
@@ -1,6 +1,6 @@ -import QtQuick 2.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.10 import im.nheko 1.0 Item { diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml
index 3ae03dd4..fa8a190d 100644 --- a/resources/qml/UserProfile.qml +++ b/resources/qml/UserProfile.qml
@@ -1,8 +1,8 @@ import "./device-verification" -import QtQuick 2.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 -import QtQuick.Window 2.3 +import QtQuick.Layouts 1.10 +import QtQuick.Window 2.10 import im.nheko 1.0 ApplicationWindow { diff --git a/resources/qml/delegates/FileMessage.qml b/resources/qml/delegates/FileMessage.qml
index ffd1e82b..a15c36c3 100644 --- a/resources/qml/delegates/FileMessage.qml +++ b/resources/qml/delegates/FileMessage.qml
@@ -1,5 +1,5 @@ -import QtQuick 2.6 -import QtQuick.Layouts 1.2 +import QtQuick 2.10 +import QtQuick.Layouts 1.10 import im.nheko 1.0 Item { diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml
index e8e325f0..9029bae6 100644 --- a/resources/qml/delegates/ImageMessage.qml +++ b/resources/qml/delegates/ImageMessage.qml
@@ -1,4 +1,4 @@ -import QtQuick 2.6 +import QtQuick 2.10 import im.nheko 1.0 Item { diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml
index 816ab183..f9510d03 100644 --- a/resources/qml/delegates/MessageDelegate.qml +++ b/resources/qml/delegates/MessageDelegate.qml
@@ -1,4 +1,4 @@ -import QtQuick 2.6 +import QtQuick 2.10 import im.nheko 1.0 Item { diff --git a/resources/qml/delegates/Pill.qml b/resources/qml/delegates/Pill.qml
index 88f6c7fd..d7616962 100644 --- a/resources/qml/delegates/Pill.qml +++ b/resources/qml/delegates/Pill.qml
@@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.10 import QtQuick.Controls 2.1 Label { diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index be22687f..fe617f58 100644 --- a/resources/qml/delegates/PlayableMediaMessage.qml +++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -1,7 +1,7 @@ -import QtMultimedia 5.6 -import QtQuick 2.6 -import QtQuick.Controls 2.1 -import QtQuick.Layouts 1.2 +import QtMultimedia 5.10 +import QtQuick 2.10 +import QtQuick.Controls 2.3 +import QtQuick.Layouts 1.10 import im.nheko 1.0 Rectangle { diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml
index fe2fe23f..cb872428 100644 --- a/resources/qml/delegates/Reply.qml +++ b/resources/qml/delegates/Reply.qml
@@ -1,7 +1,7 @@ -import QtQuick 2.6 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 -import QtQuick.Window 2.2 +import QtQuick.Layouts 1.10 +import QtQuick.Window 2.10 import im.nheko 1.0 Item { diff --git a/resources/qml/device-verification/AwaitingVerificationConfirmation.qml b/resources/qml/device-verification/AwaitingVerificationConfirmation.qml
index 42bd68df..3a143e1a 100644 --- a/resources/qml/device-verification/AwaitingVerificationConfirmation.qml +++ b/resources/qml/device-verification/AwaitingVerificationConfirmation.qml
@@ -1,5 +1,5 @@ -import QtQuick 2.3 -import QtQuick.Controls 2.10 +import QtQuick 2.10 +import QtQuick.Controls 2.3 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 5009cc3a..93cbc9bd 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.10 +import QtQuick.Controls 2.3 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 11c32d26..29b933d9 100644 --- a/resources/qml/device-verification/DigitVerification.qml +++ b/resources/qml/device-verification/DigitVerification.qml
@@ -1,5 +1,5 @@ -import QtQuick 2.3 -import QtQuick.Controls 2.10 +import QtQuick 2.10 +import QtQuick.Controls 2.3 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 73ad1c9b..511e9a86 100644 --- a/resources/qml/device-verification/EmojiElement.qml +++ b/resources/qml/device-verification/EmojiElement.qml
@@ -1,5 +1,5 @@ -import QtQuick 2.3 -import QtQuick.Controls 2.10 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import QtQuick.Layouts 1.10 Rectangle { diff --git a/resources/qml/device-verification/EmojiVerification.qml b/resources/qml/device-verification/EmojiVerification.qml
index 6ac340e4..3cf899ea 100644 --- a/resources/qml/device-verification/EmojiVerification.qml +++ b/resources/qml/device-verification/EmojiVerification.qml
@@ -1,5 +1,5 @@ -import QtQuick 2.3 -import QtQuick.Controls 2.10 +import QtQuick 2.10 +import QtQuick.Controls 2.3 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 5f9a2859..c37c177b 100644 --- a/resources/qml/device-verification/Failed.qml +++ b/resources/qml/device-verification/Failed.qml
@@ -1,5 +1,5 @@ -import QtQuick 2.3 -import QtQuick.Controls 2.10 +import QtQuick 2.10 +import QtQuick.Controls 2.3 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 d411ed47..9e492ca4 100644 --- a/resources/qml/device-verification/NewVerificationRequest.qml +++ b/resources/qml/device-verification/NewVerificationRequest.qml
@@ -1,5 +1,5 @@ -import QtQuick 2.3 -import QtQuick.Controls 2.10 +import QtQuick 2.10 +import QtQuick.Controls 2.3 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 175f7524..66a53fb7 100644 --- a/resources/qml/device-verification/Success.qml +++ b/resources/qml/device-verification/Success.qml
@@ -1,5 +1,5 @@ -import QtQuick 2.3 -import QtQuick.Controls 2.10 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import QtQuick.Layouts 1.10 Pane { diff --git a/resources/qml/device-verification/Waiting.qml b/resources/qml/device-verification/Waiting.qml
index c64c90de..e191597b 100644 --- a/resources/qml/device-verification/Waiting.qml +++ b/resources/qml/device-verification/Waiting.qml
@@ -1,5 +1,5 @@ -import QtQuick 2.3 -import QtQuick.Controls 2.10 +import QtQuick 2.10 +import QtQuick.Controls 2.3 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 928d6226..586db47f 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.1 +import QtQuick.Controls 2.3 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 e0e1ceaf..91a927be 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.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.10 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 949ba277..a0a86407 100644 --- a/resources/qml/voip/ActiveCallBar.qml +++ b/resources/qml/voip/ActiveCallBar.qml
@@ -1,7 +1,7 @@ import "../" -import QtQuick 2.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.10 import im.nheko 1.0 Rectangle { diff --git a/resources/qml/voip/CallDevices.qml b/resources/qml/voip/CallDevices.qml
index 8b30c540..6a40175a 100644 --- a/resources/qml/voip/CallDevices.qml +++ b/resources/qml/voip/CallDevices.qml
@@ -1,6 +1,6 @@ -import QtQuick 2.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.10 import im.nheko 1.0 Popup { diff --git a/resources/qml/voip/CallInviteBar.qml b/resources/qml/voip/CallInviteBar.qml
index 5c4b8f32..376337d8 100644 --- a/resources/qml/voip/CallInviteBar.qml +++ b/resources/qml/voip/CallInviteBar.qml
@@ -1,7 +1,7 @@ import "../" -import QtQuick 2.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.10 import im.nheko 1.0 Rectangle { diff --git a/resources/qml/voip/DeviceError.qml b/resources/qml/voip/DeviceError.qml
index 81872ef7..a095d31e 100644 --- a/resources/qml/voip/DeviceError.qml +++ b/resources/qml/voip/DeviceError.qml
@@ -1,6 +1,6 @@ -import QtQuick 2.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.10 import im.nheko 1.0 Popup { diff --git a/resources/qml/voip/PlaceCall.qml b/resources/qml/voip/PlaceCall.qml
index 526f056e..12fbf838 100644 --- a/resources/qml/voip/PlaceCall.qml +++ b/resources/qml/voip/PlaceCall.qml
@@ -1,7 +1,7 @@ import "../" -import QtQuick 2.9 +import QtQuick 2.10 import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.10 import im.nheko 1.0 Popup { diff --git a/resources/qml/voip/VideoCall.qml b/resources/qml/voip/VideoCall.qml
index 14408b6e..17a78773 100644 --- a/resources/qml/voip/VideoCall.qml +++ b/resources/qml/voip/VideoCall.qml
@@ -1,4 +1,4 @@ -import QtQuick 2.9 +import QtQuick 2.10 import org.freedesktop.gstreamer.GLVideoItem 1.0 GstGLVideoItem {