From 44bb52b653c27dd5a7eec2ba9d6a914cd480210b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 16 May 2017 14:27:17 +0200 Subject: [PATCH] feat(ui): update all qt modules, supports only 5.8 and later --- linphone-desktop/ui/modules/Common/Animations/BusyIndicator.qml | 2 +- linphone-desktop/ui/modules/Common/Form/ActionButton.qml | 2 +- .../ui/modules/Common/Form/Buttons/AbstractTextButton.qml | 2 +- linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml | 2 +- linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml | 2 +- linphone-desktop/ui/modules/Common/Form/ComboBox.qml | 2 +- linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml | 2 +- linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml | 2 +- .../ui/modules/Common/Form/Fields/TextAreaField.qml | 2 +- linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml | 2 +- linphone-desktop/ui/modules/Common/Form/Switch.qml | 2 +- linphone-desktop/ui/modules/Common/Form/Tab/TabBar.qml | 2 +- linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml | 2 +- linphone-desktop/ui/modules/Common/Form/Tab/TabContainer.qml | 2 +- linphone-desktop/ui/modules/Common/Indicators/VuMeter.qml | 2 +- linphone-desktop/ui/modules/Common/Misc/ForceScrollBar.qml | 2 +- linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml | 2 +- linphone-desktop/ui/modules/Common/View/ScrollableListView.qml | 2 +- linphone-desktop/ui/modules/Linphone/Chat/Chat.qml | 2 +- linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml | 2 +- linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml | 2 +- linphone-desktop/ui/views/App/Calls/Incall.qml | 2 +- linphone-desktop/ui/views/App/Main/ContactEdit.qml | 2 +- linphone-desktop/ui/views/App/Main/MainWindow.qml | 2 +- linphone-desktop/ui/views/App/Settings/SettingsWindow.qml | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/linphone-desktop/ui/modules/Common/Animations/BusyIndicator.qml b/linphone-desktop/ui/modules/Common/Animations/BusyIndicator.qml index 52f8a37ff..3169aef48 100644 --- a/linphone-desktop/ui/modules/Common/Animations/BusyIndicator.qml +++ b/linphone-desktop/ui/modules/Common/Animations/BusyIndicator.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import Common.Styles 1.0 diff --git a/linphone-desktop/ui/modules/Common/Form/ActionButton.qml b/linphone-desktop/ui/modules/Common/Form/ActionButton.qml index c6019a0e5..ef30077af 100644 --- a/linphone-desktop/ui/modules/Common/Form/ActionButton.qml +++ b/linphone-desktop/ui/modules/Common/Form/ActionButton.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import Common 1.0 diff --git a/linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml index 279e7dc72..83c6478e9 100644 --- a/linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml +++ b/linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import Common.Styles 1.0 diff --git a/linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml index 871889951..e20fdd1b1 100644 --- a/linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml +++ b/linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import Common.Styles 1.0 diff --git a/linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml b/linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml index fda502575..77ddadf92 100644 --- a/linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml +++ b/linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import Common.Styles 1.0 diff --git a/linphone-desktop/ui/modules/Common/Form/ComboBox.qml b/linphone-desktop/ui/modules/Common/Form/ComboBox.qml index 1d547cc48..4a423bad3 100644 --- a/linphone-desktop/ui/modules/Common/Form/ComboBox.qml +++ b/linphone-desktop/ui/modules/Common/Form/ComboBox.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.3 import Common 1.0 diff --git a/linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml b/linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml index 5e8749c48..74fdea55d 100644 --- a/linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml +++ b/linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import Common 1.0 diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml index b8eb0e9d1..d12a52080 100644 --- a/linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml +++ b/linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import Common 1.0 import Common.Styles 1.0 diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml index 1a5bcabf5..48b255fb0 100644 --- a/linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml +++ b/linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import Common 1.0 import Common.Styles 1.0 diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml index 836f67613..70e401d57 100644 --- a/linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml +++ b/linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 as Controls +import QtQuick.Controls 2.1 as Controls import Common 1.0 import Common.Styles 1.0 diff --git a/linphone-desktop/ui/modules/Common/Form/Switch.qml b/linphone-desktop/ui/modules/Common/Form/Switch.qml index 799bacafa..b41bca745 100644 --- a/linphone-desktop/ui/modules/Common/Form/Switch.qml +++ b/linphone-desktop/ui/modules/Common/Form/Switch.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import Common.Styles 1.0 diff --git a/linphone-desktop/ui/modules/Common/Form/Tab/TabBar.qml b/linphone-desktop/ui/modules/Common/Form/Tab/TabBar.qml index 9398c574d..257da8878 100644 --- a/linphone-desktop/ui/modules/Common/Form/Tab/TabBar.qml +++ b/linphone-desktop/ui/modules/Common/Form/Tab/TabBar.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 // ============================================================================= diff --git a/linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml b/linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml index f46cd15e2..de836ca80 100644 --- a/linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml +++ b/linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 as Controls +import QtQuick.Controls 2.1 as Controls import QtQuick.Layouts 1.3 import Common 1.0 diff --git a/linphone-desktop/ui/modules/Common/Form/Tab/TabContainer.qml b/linphone-desktop/ui/modules/Common/Form/Tab/TabContainer.qml index 58401c401..7d036d12a 100644 --- a/linphone-desktop/ui/modules/Common/Form/Tab/TabContainer.qml +++ b/linphone-desktop/ui/modules/Common/Form/Tab/TabContainer.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.3 import Common 1.0 diff --git a/linphone-desktop/ui/modules/Common/Indicators/VuMeter.qml b/linphone-desktop/ui/modules/Common/Indicators/VuMeter.qml index 938cf0ffa..d02b07a15 100644 --- a/linphone-desktop/ui/modules/Common/Indicators/VuMeter.qml +++ b/linphone-desktop/ui/modules/Common/Indicators/VuMeter.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import Common.Styles 1.0 diff --git a/linphone-desktop/ui/modules/Common/Misc/ForceScrollBar.qml b/linphone-desktop/ui/modules/Common/Misc/ForceScrollBar.qml index f9cf1d7ea..9ee8df01b 100644 --- a/linphone-desktop/ui/modules/Common/Misc/ForceScrollBar.qml +++ b/linphone-desktop/ui/modules/Common/Misc/ForceScrollBar.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import Common.Styles 1.0 diff --git a/linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml b/linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml index cca8426b0..bafc98fc5 100644 --- a/linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml +++ b/linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import Common 1.0 import Common.Styles 1.0 diff --git a/linphone-desktop/ui/modules/Common/View/ScrollableListView.qml b/linphone-desktop/ui/modules/Common/View/ScrollableListView.qml index 6e44297d3..23d67c289 100644 --- a/linphone-desktop/ui/modules/Common/View/ScrollableListView.qml +++ b/linphone-desktop/ui/modules/Common/View/ScrollableListView.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import Common 1.0 diff --git a/linphone-desktop/ui/modules/Linphone/Chat/Chat.qml b/linphone-desktop/ui/modules/Linphone/Chat/Chat.qml index 4516e93ec..f1a137da5 100644 --- a/linphone-desktop/ui/modules/Linphone/Chat/Chat.qml +++ b/linphone-desktop/ui/modules/Linphone/Chat/Chat.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.3 import Common 1.0 diff --git a/linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml b/linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml index 371fea724..f73b26cec 100644 --- a/linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml +++ b/linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml b/linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml index 39b05d090..19e95a579 100644 --- a/linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml +++ b/linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.3 import Common 1.0 diff --git a/linphone-desktop/ui/views/App/Calls/Incall.qml b/linphone-desktop/ui/views/App/Calls/Incall.qml index a0cd5204d..33a908666 100644 --- a/linphone-desktop/ui/views/App/Calls/Incall.qml +++ b/linphone-desktop/ui/views/App/Calls/Incall.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.3 import Common 1.0 diff --git a/linphone-desktop/ui/views/App/Main/ContactEdit.qml b/linphone-desktop/ui/views/App/Main/ContactEdit.qml index 23eef558b..b44c60bed 100644 --- a/linphone-desktop/ui/views/App/Main/ContactEdit.qml +++ b/linphone-desktop/ui/views/App/Main/ContactEdit.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.3 diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.qml b/linphone-desktop/ui/views/App/Main/MainWindow.qml index addf7c451..792032a8b 100644 --- a/linphone-desktop/ui/views/App/Main/MainWindow.qml +++ b/linphone-desktop/ui/views/App/Main/MainWindow.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.3 import Common 1.0 diff --git a/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml b/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml index 6f8804438..ebc6bea67 100644 --- a/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml +++ b/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.3 import Common 1.0