From 6090d00251ce8cb192a564d74dab91c735e6745f Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Tue, 12 Jan 2021 15:03:39 +0100 Subject: Revert "Update QtQuick versions to match Qt 5.10" This reverts commit 74e32dd96b8ed04d46802226551e72b68ab17e48. --- .../qml/device-verification/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 ++-- resources/qml/device-verification/NewVerificationRequest.qml | 4 ++-- resources/qml/device-verification/Success.qml | 4 ++-- resources/qml/device-verification/Waiting.qml | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'resources/qml/device-verification') 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 -- cgit 1.5.1