From 24a6d3f91027db489cfc8e704e0fe6237e264456 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 30 Sep 2024 11:11:35 +0200 Subject: [PATCH] Fix QML Windows style --- Linphone/view/Control/Button/CalendarComboBox.qml | 2 +- Linphone/view/Control/Button/CheckBox.qml | 2 +- Linphone/view/Control/Button/CheckableButton.qml | 4 ++-- Linphone/view/Control/Button/ComboBox.qml | 4 ++-- .../view/Control/Button/CountryIndicatorCombobox.qml | 4 ++-- Linphone/view/Control/Button/PopupButton.qml | 2 +- Linphone/view/Control/Button/RadioButton.qml | 2 +- Linphone/view/Control/Button/SecurityRadioButton.qml | 4 ++-- Linphone/view/Control/Button/Slider.qml | 2 +- Linphone/view/Control/Button/Switch.qml | 2 +- .../Control/Container/Call/ActiveSpeakerLayout.qml | 2 +- Linphone/view/Control/Container/Call/CallLayout.qml | 2 +- Linphone/view/Control/Container/Call/Mosaic.qml | 2 +- Linphone/view/Control/Container/Carousel.qml | 6 +++--- .../view/Control/Container/Contact/ContactLayout.qml | 2 +- Linphone/view/Control/Container/FormItemLayout.qml | 2 +- .../view/Control/Container/Main/MainRightPanel.qml | 6 +++--- Linphone/view/Control/Container/TabBar.qml | 2 +- Linphone/view/Control/Container/VerticalTabBar.qml | 6 +++--- Linphone/view/Control/Display/BusyIndicator.qml | 2 +- Linphone/view/Control/Display/Contact/Avatar.qml | 6 +++--- Linphone/view/Control/Display/Contact/Contact.qml | 2 +- .../view/Control/Display/Contact/ContactListView.qml | 6 +++--- Linphone/view/Control/Display/Contact/Voicemail.qml | 2 +- Linphone/view/Control/Display/EffectImage.qml | 6 +++--- Linphone/view/Control/Display/ProgressBar.qml | 4 ++-- Linphone/view/Control/Display/RoundedPane.qml | 4 ++-- .../view/Control/Display/Settings/SettingsMenuItem.qml | 2 +- Linphone/view/Control/Display/Sticker.qml | 2 +- Linphone/view/Control/Display/TemporaryText.qml | 4 ++-- Linphone/view/Control/Display/ToolTip.qml | 4 ++-- Linphone/view/Control/Form/Login/LoginForm.qml | 2 +- .../view/Control/Form/Settings/MultimediaSettings.qml | 2 +- .../view/Control/Form/Settings/ScreencastSettings.qml | 4 ++-- Linphone/view/Control/Input/Calendar.qml | 2 +- Linphone/view/Control/Input/DecoratedTextField.qml | 2 +- Linphone/view/Control/Input/DigitInput.qml | 6 +++--- Linphone/view/Control/Input/NumericPad.qml | 2 +- Linphone/view/Control/Input/PhoneNumberInput.qml | 6 +++--- Linphone/view/Control/Input/SearchBar.qml | 4 ++-- Linphone/view/Control/Input/TextArea.qml | 4 ++-- Linphone/view/Control/Input/TextField.qml | 4 ++-- Linphone/view/Control/Popup/DesktopPopup.qml | 10 +++++----- .../view/Control/Popup/Dialog/AuthenticationDialog.qml | 4 ++-- Linphone/view/Control/Popup/Dialog/Dialog.qml | 4 ++-- Linphone/view/Control/Popup/InformationPopup.qml | 6 +++--- Linphone/view/Control/Popup/Loading/LoadingPopup.qml | 8 ++++---- Linphone/view/Control/Popup/NumericPadPopup.qml | 2 +- Linphone/view/Control/Popup/Popup.qml | 2 +- .../view/Control/Tool/Prototype/AccountsPrototype.qml | 6 +++--- Linphone/view/Control/Tool/Prototype/CallPrototype.qml | 6 +++--- .../view/Control/Tool/Prototype/CameraPrototype.qml | 2 +- .../view/Control/Tool/Prototype/FriendPrototype.qml | 6 +++--- Linphone/view/Control/Tool/Prototype/ItemPrototype.qml | 6 +++--- .../Control/Tool/Prototype/PhoneNumberPrototype.qml | 6 +++--- Linphone/view/Page/Form/Call/NewCallForm.qml | 2 +- Linphone/view/Page/Form/Contact/ContactDescription.qml | 2 +- Linphone/view/Page/Form/Contact/ContactEdition.qml | 2 +- Linphone/view/Page/Form/Login/LoginPage.qml | 2 +- Linphone/view/Page/Form/Login/SIPLoginPage.qml | 2 +- .../view/Page/Form/Meeting/AddParticipantsForm.qml | 2 +- Linphone/view/Page/Form/Meeting/MeetingForm.qml | 2 +- .../view/Page/Form/Register/RegisterCheckingPage.qml | 6 +++--- Linphone/view/Page/Form/Register/RegisterPage.qml | 6 +++--- Linphone/view/Page/Form/Security/SecurityModePage.qml | 6 +++--- .../view/Page/Form/Settings/AbstractSettingsMenu.qml | 2 +- .../view/Page/Form/Settings/AccountSettingsPage.qml | 2 +- Linphone/view/Page/Form/Settings/SettingsPage.qml | 2 +- Linphone/view/Page/Layout/Login/LoginLayout.qml | 6 +++--- Linphone/view/Page/Layout/Main/MainLayout.qml | 6 +++--- .../Page/Layout/Settings/AbstractSettingsLayout.qml | 2 +- .../Layout/Settings/AccountSettingsGeneralLayout.qml | 2 +- .../Settings/AccountSettingsParametersLayout.qml | 2 +- .../view/Page/Layout/Settings/CallSettingsLayout.qml | 2 +- .../Page/Layout/Settings/ContactsSettingsLayout.qml | 2 +- .../view/Page/Layout/Settings/DebugSettingsLayout.qml | 2 +- .../view/Page/Layout/Settings/LdapSettingsLayout.qml | 2 +- .../Page/Layout/Settings/SecuritySettingsLayout.qml | 2 +- Linphone/view/Page/Main/AbstractMainPage.qml | 6 +++--- Linphone/view/Page/Main/Account/AccountListView.qml | 2 +- Linphone/view/Page/Main/Call/CallPage.qml | 2 +- Linphone/view/Page/Main/Call/CallSettingsPanel.qml | 4 ++-- Linphone/view/Page/Main/Call/WaitingRoom.qml | 4 ++-- Linphone/view/Page/Main/Contact/ContactPage.qml | 2 +- Linphone/view/Page/Main/Help/HelpPage.qml | 2 +- Linphone/view/Page/Main/Meeting/MeetingPage.qml | 4 ++-- Linphone/view/Page/Main/Start/WelcomePage.qml | 6 +++--- Linphone/view/Page/Window/AbstractWindow.qml | 6 +++--- Linphone/view/Page/Window/Call/CallsWindow.qml | 4 ++-- Linphone/view/Page/Window/Main/MainWindow.qml | 6 +++--- Linphone/view/Test/ItemsTest.qml | 6 +++--- 91 files changed, 164 insertions(+), 164 deletions(-) diff --git a/Linphone/view/Control/Button/CalendarComboBox.qml b/Linphone/view/Control/Button/CalendarComboBox.qml index 67475a70..d2897b94 100644 --- a/Linphone/view/Control/Button/CalendarComboBox.qml +++ b/Linphone/view/Control/Button/CalendarComboBox.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Effects import QtQuick.Layouts import Linphone diff --git a/Linphone/view/Control/Button/CheckBox.qml b/Linphone/view/Control/Button/CheckBox.qml index 2c5cbfa2..bc7a350c 100644 --- a/Linphone/view/Control/Button/CheckBox.qml +++ b/Linphone/view/Control/Button/CheckBox.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import QtQuick.Effects diff --git a/Linphone/view/Control/Button/CheckableButton.qml b/Linphone/view/Control/Button/CheckableButton.qml index 26a5617a..7ebbc5a7 100644 --- a/Linphone/view/Control/Button/CheckableButton.qml +++ b/Linphone/view/Control/Button/CheckableButton.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Layouts import QtQuick.Effects -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone Button { diff --git a/Linphone/view/Control/Button/ComboBox.qml b/Linphone/view/Control/Button/ComboBox.qml index 714f444f..43d8a22c 100644 --- a/Linphone/view/Control/Button/ComboBox.qml +++ b/Linphone/view/Control/Button/ComboBox.qml @@ -1,6 +1,6 @@ import QtQuick -import QtQuick.Controls as Control -import QtQuick.Layouts 1.0 +import QtQuick.Controls.Material as Control +import QtQuick.Layouts import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Button/CountryIndicatorCombobox.qml b/Linphone/view/Control/Button/CountryIndicatorCombobox.qml index 94abf307..7b8fb767 100644 --- a/Linphone/view/Control/Button/CountryIndicatorCombobox.qml +++ b/Linphone/view/Control/Button/CountryIndicatorCombobox.qml @@ -1,6 +1,6 @@ import QtQuick -import QtQuick.Controls as Control -import QtQuick.Layouts 1.0 +import QtQuick.Controls.Material as Control +import QtQuick.Layouts import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Button/PopupButton.qml b/Linphone/view/Control/Button/PopupButton.qml index d5a0a04e..bc0d627b 100644 --- a/Linphone/view/Control/Button/PopupButton.qml +++ b/Linphone/view/Control/Button/PopupButton.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls 2.2 as Control +import QtQuick.Controls.Material as Control import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Button/RadioButton.qml b/Linphone/view/Control/Button/RadioButton.qml index 891bcf18..a8e18286 100644 --- a/Linphone/view/Control/Button/RadioButton.qml +++ b/Linphone/view/Control/Button/RadioButton.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Layouts import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Button/SecurityRadioButton.qml b/Linphone/view/Control/Button/SecurityRadioButton.qml index 37dde784..191f4b65 100644 --- a/Linphone/view/Control/Button/SecurityRadioButton.qml +++ b/Linphone/view/Control/Button/SecurityRadioButton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.2 as Control +import QtQuick +import QtQuick.Controls.Material as Control import QtQuick.Layouts import Linphone diff --git a/Linphone/view/Control/Button/Slider.qml b/Linphone/view/Control/Button/Slider.qml index af67eea7..8034892e 100644 --- a/Linphone/view/Control/Button/Slider.qml +++ b/Linphone/view/Control/Button/Slider.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Effects import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone Control.Slider { diff --git a/Linphone/view/Control/Button/Switch.qml b/Linphone/view/Control/Button/Switch.qml index 104c4217..976d6bcf 100644 --- a/Linphone/view/Control/Button/Switch.qml +++ b/Linphone/view/Control/Button/Switch.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Container/Call/ActiveSpeakerLayout.qml b/Linphone/view/Control/Container/Call/ActiveSpeakerLayout.qml index 216cc05b..cb1f977f 100644 --- a/Linphone/view/Control/Container/Call/ActiveSpeakerLayout.qml +++ b/Linphone/view/Control/Container/Call/ActiveSpeakerLayout.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Effects import QtQml.Models -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import EnumsToStringCpp 1.0 import UtilsCpp 1.0 diff --git a/Linphone/view/Control/Container/Call/CallLayout.qml b/Linphone/view/Control/Container/Call/CallLayout.qml index 950ef251..98917b95 100644 --- a/Linphone/view/Control/Container/Call/CallLayout.qml +++ b/Linphone/view/Control/Container/Call/CallLayout.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts as Layout import QtQuick.Effects import QtQml.Models -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import EnumsToStringCpp 1.0 import UtilsCpp 1.0 diff --git a/Linphone/view/Control/Container/Call/Mosaic.qml b/Linphone/view/Control/Container/Call/Mosaic.qml index 2e88898e..25ca2c41 100644 --- a/Linphone/view/Control/Container/Call/Mosaic.qml +++ b/Linphone/view/Control/Container/Call/Mosaic.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Material import QtQuick.Layouts import QtQml.Models diff --git a/Linphone/view/Control/Container/Carousel.qml b/Linphone/view/Control/Container/Carousel.qml index 9b16bea9..2f0b57bc 100644 --- a/Linphone/view/Control/Container/Carousel.qml +++ b/Linphone/view/Control/Container/Carousel.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.2 as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import Linphone diff --git a/Linphone/view/Control/Container/Contact/ContactLayout.qml b/Linphone/view/Control/Container/Contact/ContactLayout.qml index 1959dacb..94a3938e 100644 --- a/Linphone/view/Control/Container/Contact/ContactLayout.qml +++ b/Linphone/view/Control/Container/Contact/ContactLayout.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Effects import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp import SettingsCpp diff --git a/Linphone/view/Control/Container/FormItemLayout.qml b/Linphone/view/Control/Container/FormItemLayout.qml index 30bd351a..4a159b1e 100644 --- a/Linphone/view/Control/Container/FormItemLayout.qml +++ b/Linphone/view/Control/Container/FormItemLayout.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Layouts import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Container/Main/MainRightPanel.qml b/Linphone/view/Control/Container/Main/MainRightPanel.qml index 9269475f..35d78b58 100644 --- a/Linphone/view/Control/Container/Main/MainRightPanel.qml +++ b/Linphone/view/Control/Container/Main/MainRightPanel.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Effects import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp 1.0 @@ -25,4 +25,4 @@ ColumnLayout { Layout.fillWidth: true Layout.fillHeight: true } -} \ No newline at end of file +} diff --git a/Linphone/view/Control/Container/TabBar.qml b/Linphone/view/Control/Container/TabBar.qml index 39ea4587..6bb28625 100644 --- a/Linphone/view/Control/Container/TabBar.qml +++ b/Linphone/view/Control/Container/TabBar.qml @@ -1,6 +1,6 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Container/VerticalTabBar.qml b/Linphone/view/Control/Container/VerticalTabBar.qml index 7cbdee4c..7a516f98 100644 --- a/Linphone/view/Control/Container/VerticalTabBar.qml +++ b/Linphone/view/Control/Container/VerticalTabBar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.7 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.2 as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Display/BusyIndicator.qml b/Linphone/view/Control/Display/BusyIndicator.qml index 3a6fb595..77070422 100644 --- a/Linphone/view/Control/Display/BusyIndicator.qml +++ b/Linphone/view/Control/Display/BusyIndicator.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Display/Contact/Avatar.qml b/Linphone/view/Control/Display/Contact/Avatar.qml index e6e2d629..38d012a8 100644 --- a/Linphone/view/Control/Display/Contact/Avatar.qml +++ b/Linphone/view/Control/Display/Contact/Avatar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.7 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Display/Contact/Contact.qml b/Linphone/view/Control/Display/Contact/Contact.qml index 273c3167..be72842a 100644 --- a/Linphone/view/Control/Display/Contact/Contact.qml +++ b/Linphone/view/Control/Display/Contact/Contact.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Effects import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone diff --git a/Linphone/view/Control/Display/Contact/ContactListView.qml b/Linphone/view/Control/Display/Contact/ContactListView.qml index a73d3a06..43dbc91b 100644 --- a/Linphone/view/Control/Display/Contact/ContactListView.qml +++ b/Linphone/view/Control/Display/Contact/ContactListView.qml @@ -1,6 +1,6 @@ -import QtQuick 2.7 -import QtQuick.Layouts 1.3 -import QtQuick.Controls as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp 1.0 diff --git a/Linphone/view/Control/Display/Contact/Voicemail.qml b/Linphone/view/Control/Display/Contact/Voicemail.qml index 8fec3c61..771d32ba 100644 --- a/Linphone/view/Control/Display/Contact/Voicemail.qml +++ b/Linphone/view/Control/Display/Contact/Voicemail.qml @@ -1,6 +1,6 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls +import QtQuick.Controls.Material import Linphone import UtilsCpp diff --git a/Linphone/view/Control/Display/EffectImage.qml b/Linphone/view/Control/Display/EffectImage.qml index f657f29b..d6cad888 100644 --- a/Linphone/view/Control/Display/EffectImage.qml +++ b/Linphone/view/Control/Display/EffectImage.qml @@ -1,6 +1,6 @@ -import QtQuick 2.7 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.2 as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Display/ProgressBar.qml b/Linphone/view/Control/Display/ProgressBar.qml index 18790eba..4e3624ab 100644 --- a/Linphone/view/Control/Display/ProgressBar.qml +++ b/Linphone/view/Control/Display/ProgressBar.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Material import Linphone ProgressBar { @@ -38,4 +38,4 @@ ProgressBar { } } } -} \ No newline at end of file +} diff --git a/Linphone/view/Control/Display/RoundedPane.qml b/Linphone/view/Control/Display/RoundedPane.qml index ed9d684e..93305356 100644 --- a/Linphone/view/Control/Display/RoundedPane.qml +++ b/Linphone/view/Control/Display/RoundedPane.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone Control.Control { @@ -12,4 +12,4 @@ Control.Control { radius: 15 * DefaultStyle.dp color: mainItem.backgroundColor } -} \ No newline at end of file +} diff --git a/Linphone/view/Control/Display/Settings/SettingsMenuItem.qml b/Linphone/view/Control/Display/Settings/SettingsMenuItem.qml index 88e490e1..66dbf2f6 100644 --- a/Linphone/view/Control/Display/Settings/SettingsMenuItem.qml +++ b/Linphone/view/Control/Display/Settings/SettingsMenuItem.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Layouts import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Display/Sticker.qml b/Linphone/view/Control/Display/Sticker.qml index f8d11070..a1d250e4 100644 --- a/Linphone/view/Control/Display/Sticker.qml +++ b/Linphone/view/Control/Display/Sticker.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Effects import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp import SettingsCpp diff --git a/Linphone/view/Control/Display/TemporaryText.qml b/Linphone/view/Control/Display/TemporaryText.qml index 1ba482fc..bfa3c604 100644 --- a/Linphone/view/Control/Display/TemporaryText.qml +++ b/Linphone/view/Control/Display/TemporaryText.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Layouts 1.0 import QtQuick.Effects import Linphone @@ -34,4 +34,4 @@ Text { } onTextChanged: if (mainItem.text.length > 0) autoHideErrorMessage.restart() -} \ No newline at end of file +} diff --git a/Linphone/view/Control/Display/ToolTip.qml b/Linphone/view/Control/Display/ToolTip.qml index 9b2f629e..2cb8b709 100644 --- a/Linphone/view/Control/Display/ToolTip.qml +++ b/Linphone/view/Control/Display/ToolTip.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls as Control +import QtQuick +import QtQuick.Controls.Material as Control import Linphone Control.ToolTip { diff --git a/Linphone/view/Control/Form/Login/LoginForm.qml b/Linphone/view/Control/Form/Login/LoginForm.qml index ec4b2bae..e62261ab 100644 --- a/Linphone/view/Control/Form/Login/LoginForm.qml +++ b/Linphone/view/Control/Form/Login/LoginForm.qml @@ -1,6 +1,6 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import ConstantsCpp 1.0 diff --git a/Linphone/view/Control/Form/Settings/MultimediaSettings.qml b/Linphone/view/Control/Form/Settings/MultimediaSettings.qml index 947e4b7e..37646bfe 100644 --- a/Linphone/view/Control/Form/Settings/MultimediaSettings.qml +++ b/Linphone/view/Control/Form/Settings/MultimediaSettings.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Layouts import Linphone import SettingsCpp 1.0 diff --git a/Linphone/view/Control/Form/Settings/ScreencastSettings.qml b/Linphone/view/Control/Form/Settings/ScreencastSettings.qml index edb23a08..1bbb7f95 100644 --- a/Linphone/view/Control/Form/Settings/ScreencastSettings.qml +++ b/Linphone/view/Control/Form/Settings/ScreencastSettings.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Layouts import QtQuick.Effects -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp 1.0 diff --git a/Linphone/view/Control/Input/Calendar.qml b/Linphone/view/Control/Input/Calendar.qml index f5377f21..63788cfa 100644 --- a/Linphone/view/Control/Input/Calendar.qml +++ b/Linphone/view/Control/Input/Calendar.qml @@ -1,6 +1,6 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Input/DecoratedTextField.qml b/Linphone/view/Control/Input/DecoratedTextField.qml index d9e02048..e7f1c51d 100644 --- a/Linphone/view/Control/Input/DecoratedTextField.qml +++ b/Linphone/view/Control/Input/DecoratedTextField.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Layouts 1.0 import QtQuick.Effects import UtilsCpp diff --git a/Linphone/view/Control/Input/DigitInput.qml b/Linphone/view/Control/Input/DigitInput.qml index b5722852..879683ca 100644 --- a/Linphone/view/Control/Input/DigitInput.qml +++ b/Linphone/view/Control/Input/DigitInput.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.2 as Control +import QtQuick +import QtQuick.Controls.Material as Control import Linphone Control.TextField { @@ -49,4 +49,4 @@ Control.TextField { anchors.bottomMargin: (mainItem.inputSize / 8) * DefaultStyle.dp } } -} \ No newline at end of file +} diff --git a/Linphone/view/Control/Input/NumericPad.qml b/Linphone/view/Control/Input/NumericPad.qml index 3600cd03..4e01a1ef 100644 --- a/Linphone/view/Control/Input/NumericPad.qml +++ b/Linphone/view/Control/Input/NumericPad.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Layouts as Layout import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Input/PhoneNumberInput.qml b/Linphone/view/Control/Input/PhoneNumberInput.qml index 7241626f..da1487df 100644 --- a/Linphone/view/Control/Input/PhoneNumberInput.qml +++ b/Linphone/view/Control/Input/PhoneNumberInput.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls -import QtQuick.Layouts 1.0 +import QtQuick +import QtQuick.Controls.Material +import QtQuick.Layouts import Linphone ColumnLayout { diff --git a/Linphone/view/Control/Input/SearchBar.qml b/Linphone/view/Control/Input/SearchBar.qml index 674f903c..fa1acedf 100644 --- a/Linphone/view/Control/Input/SearchBar.qml +++ b/Linphone/view/Control/Input/SearchBar.qml @@ -1,6 +1,6 @@ import QtQuick -import QtQuick.Controls as Control -import QtQuick.Layouts 1.0 +import QtQuick.Controls.Material as Control +import QtQuick.Layouts import Linphone diff --git a/Linphone/view/Control/Input/TextArea.qml b/Linphone/view/Control/Input/TextArea.qml index 0115afad..d9551ecf 100644 --- a/Linphone/view/Control/Input/TextArea.qml +++ b/Linphone/view/Control/Input/TextArea.qml @@ -1,6 +1,6 @@ import QtQuick -import QtQuick.Controls as Control -import QtQuick.Layouts 1.0 +import QtQuick.Controls.Material as Control +import QtQuick.Layouts import Linphone TextEdit { diff --git a/Linphone/view/Control/Input/TextField.qml b/Linphone/view/Control/Input/TextField.qml index dbe7ba90..e713d508 100644 --- a/Linphone/view/Control/Input/TextField.qml +++ b/Linphone/view/Control/Input/TextField.qml @@ -1,6 +1,6 @@ import QtQuick -import QtQuick.Controls as Control -import QtQuick.Layouts 1.0 +import QtQuick.Controls.Material as Control +import QtQuick.Layouts import Linphone Control.TextField { diff --git a/Linphone/view/Control/Popup/DesktopPopup.qml b/Linphone/view/Control/Popup/DesktopPopup.qml index e56066a2..f7cb2564 100644 --- a/Linphone/view/Control/Popup/DesktopPopup.qml +++ b/Linphone/view/Control/Popup/DesktopPopup.qml @@ -1,9 +1,9 @@ -import QtQuick 2.7 -import QtQuick.Window 2.2 +import QtQuick +import QtQuick.Window -import QtQuick.Controls 2.2 -import QtQuick.Layouts 1.3 -import Qt.labs.platform 1.0 +import QtQuick.Controls.Material +import QtQuick.Layouts +import Qt.labs.platform // ============================================================================= diff --git a/Linphone/view/Control/Popup/Dialog/AuthenticationDialog.qml b/Linphone/view/Control/Popup/Dialog/AuthenticationDialog.qml index eaec4c60..1ee14c19 100644 --- a/Linphone/view/Control/Popup/Dialog/AuthenticationDialog.qml +++ b/Linphone/view/Control/Popup/Dialog/AuthenticationDialog.qml @@ -1,7 +1,7 @@ import QtCore import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Dialogs import Linphone @@ -102,4 +102,4 @@ Dialog { } } ] -} \ No newline at end of file +} diff --git a/Linphone/view/Control/Popup/Dialog/Dialog.qml b/Linphone/view/Control/Popup/Dialog/Dialog.qml index c1084f1b..e6f663fe 100644 --- a/Linphone/view/Control/Popup/Dialog/Dialog.qml +++ b/Linphone/view/Control/Popup/Dialog/Dialog.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.2 as Control +import QtQuick +import QtQuick.Controls.Material as Control import QtQuick.Effects import QtQuick.Layouts import Linphone diff --git a/Linphone/view/Control/Popup/InformationPopup.qml b/Linphone/view/Control/Popup/InformationPopup.qml index f30501ca..e2039c53 100644 --- a/Linphone/view/Control/Popup/InformationPopup.qml +++ b/Linphone/view/Control/Popup/InformationPopup.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.3 -import QtQuick.Controls +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material import Linphone Popup { diff --git a/Linphone/view/Control/Popup/Loading/LoadingPopup.qml b/Linphone/view/Control/Popup/Loading/LoadingPopup.qml index 52746203..f99cfb89 100644 --- a/Linphone/view/Control/Popup/Loading/LoadingPopup.qml +++ b/Linphone/view/Control/Popup/Loading/LoadingPopup.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.3 -import QtQuick.Controls +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material import Linphone Popup { @@ -38,4 +38,4 @@ Popup { onClicked: mainItem.close() } } -} \ No newline at end of file +} diff --git a/Linphone/view/Control/Popup/NumericPadPopup.qml b/Linphone/view/Control/Popup/NumericPadPopup.qml index 42af087c..4183fa78 100644 --- a/Linphone/view/Control/Popup/NumericPadPopup.qml +++ b/Linphone/view/Control/Popup/NumericPadPopup.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Layouts as Layout import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Popup/Popup.qml b/Linphone/view/Control/Popup/Popup.qml index f6e7e8e6..8ebf7b3a 100644 --- a/Linphone/view/Control/Popup/Popup.qml +++ b/Linphone/view/Control/Popup/Popup.qml @@ -1,5 +1,5 @@ import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Effects import Linphone diff --git a/Linphone/view/Control/Tool/Prototype/AccountsPrototype.qml b/Linphone/view/Control/Tool/Prototype/AccountsPrototype.qml index cdcc0471..1540cc4e 100644 --- a/Linphone/view/Control/Tool/Prototype/AccountsPrototype.qml +++ b/Linphone/view/Control/Tool/Prototype/AccountsPrototype.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.0 -import QtQuick.Controls as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp 1.0 import LinphoneAccountsCpp diff --git a/Linphone/view/Control/Tool/Prototype/CallPrototype.qml b/Linphone/view/Control/Tool/Prototype/CallPrototype.qml index a4d751a2..4e08f60b 100644 --- a/Linphone/view/Control/Tool/Prototype/CallPrototype.qml +++ b/Linphone/view/Control/Tool/Prototype/CallPrototype.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.0 -import QtQuick.Controls as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp 1.0 import LinphoneAccountsCpp diff --git a/Linphone/view/Control/Tool/Prototype/CameraPrototype.qml b/Linphone/view/Control/Tool/Prototype/CameraPrototype.qml index 99e272ce..c91e36cf 100644 --- a/Linphone/view/Control/Tool/Prototype/CameraPrototype.qml +++ b/Linphone/view/Control/Tool/Prototype/CameraPrototype.qml @@ -1,6 +1,6 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp 1.0 diff --git a/Linphone/view/Control/Tool/Prototype/FriendPrototype.qml b/Linphone/view/Control/Tool/Prototype/FriendPrototype.qml index c072aa8a..28aa35a0 100644 --- a/Linphone/view/Control/Tool/Prototype/FriendPrototype.qml +++ b/Linphone/view/Control/Tool/Prototype/FriendPrototype.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.0 -import QtQuick.Controls as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp 1.0 diff --git a/Linphone/view/Control/Tool/Prototype/ItemPrototype.qml b/Linphone/view/Control/Tool/Prototype/ItemPrototype.qml index c85d765e..45e14f47 100644 --- a/Linphone/view/Control/Tool/Prototype/ItemPrototype.qml +++ b/Linphone/view/Control/Tool/Prototype/ItemPrototype.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.0 -import QtQuick.Controls as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp 1.0 diff --git a/Linphone/view/Control/Tool/Prototype/PhoneNumberPrototype.qml b/Linphone/view/Control/Tool/Prototype/PhoneNumberPrototype.qml index 0076e3eb..4eb6636f 100644 --- a/Linphone/view/Control/Tool/Prototype/PhoneNumberPrototype.qml +++ b/Linphone/view/Control/Tool/Prototype/PhoneNumberPrototype.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.0 -import QtQuick.Controls as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import Linphone // Snippet diff --git a/Linphone/view/Page/Form/Call/NewCallForm.qml b/Linphone/view/Page/Form/Call/NewCallForm.qml index 66b74fa9..11c8f26d 100644 --- a/Linphone/view/Page/Form/Call/NewCallForm.qml +++ b/Linphone/view/Page/Form/Call/NewCallForm.qml @@ -1,6 +1,6 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Effects import Linphone diff --git a/Linphone/view/Page/Form/Contact/ContactDescription.qml b/Linphone/view/Page/Form/Contact/ContactDescription.qml index 15c8d108..8eecf999 100644 --- a/Linphone/view/Page/Form/Contact/ContactDescription.qml +++ b/Linphone/view/Page/Form/Contact/ContactDescription.qml @@ -1,6 +1,6 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls +import QtQuick.Controls.Material import Linphone import UtilsCpp diff --git a/Linphone/view/Page/Form/Contact/ContactEdition.qml b/Linphone/view/Page/Form/Contact/ContactEdition.qml index 8c70c036..535ae688 100644 --- a/Linphone/view/Page/Form/Contact/ContactEdition.qml +++ b/Linphone/view/Page/Form/Contact/ContactEdition.qml @@ -1,6 +1,6 @@ import QtCore import QtQuick -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Dialogs import QtQuick.Effects import QtQuick.Layouts diff --git a/Linphone/view/Page/Form/Login/LoginPage.qml b/Linphone/view/Page/Form/Login/LoginPage.qml index ad7b4245..fb62bf28 100644 --- a/Linphone/view/Page/Form/Login/LoginPage.qml +++ b/Linphone/view/Page/Form/Login/LoginPage.qml @@ -1,6 +1,6 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp diff --git a/Linphone/view/Page/Form/Login/SIPLoginPage.qml b/Linphone/view/Page/Form/Login/SIPLoginPage.qml index 496da91b..46dbcebc 100644 --- a/Linphone/view/Page/Form/Login/SIPLoginPage.qml +++ b/Linphone/view/Page/Form/Login/SIPLoginPage.qml @@ -1,6 +1,6 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import ConstantsCpp import SettingsCpp diff --git a/Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml b/Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml index 2ad5a300..b438f7ca 100644 --- a/Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml +++ b/Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Effects import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp import SettingsCpp diff --git a/Linphone/view/Page/Form/Meeting/MeetingForm.qml b/Linphone/view/Page/Form/Meeting/MeetingForm.qml index 77c23b95..0b0db98c 100644 --- a/Linphone/view/Page/Form/Meeting/MeetingForm.qml +++ b/Linphone/view/Page/Form/Meeting/MeetingForm.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Effects import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp import SettingsCpp diff --git a/Linphone/view/Page/Form/Register/RegisterCheckingPage.qml b/Linphone/view/Page/Form/Register/RegisterCheckingPage.qml index 4c98458f..e5f4543d 100644 --- a/Linphone/view/Page/Form/Register/RegisterCheckingPage.qml +++ b/Linphone/view/Page/Form/Register/RegisterCheckingPage.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.3 -import QtQuick.Controls as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp diff --git a/Linphone/view/Page/Form/Register/RegisterPage.qml b/Linphone/view/Page/Form/Register/RegisterPage.qml index 099cd983..7ec1ede4 100644 --- a/Linphone/view/Page/Form/Register/RegisterPage.qml +++ b/Linphone/view/Page/Form/Register/RegisterPage.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.3 -import QtQuick.Controls as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp 1.0 import ConstantsCpp 1.0 diff --git a/Linphone/view/Page/Form/Security/SecurityModePage.qml b/Linphone/view/Page/Form/Security/SecurityModePage.qml index dacfe128..c4077a82 100644 --- a/Linphone/view/Page/Form/Security/SecurityModePage.qml +++ b/Linphone/view/Page/Form/Security/SecurityModePage.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.0 -import QtQuick.Controls as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import Linphone LoginLayout { diff --git a/Linphone/view/Page/Form/Settings/AbstractSettingsMenu.qml b/Linphone/view/Page/Form/Settings/AbstractSettingsMenu.qml index 5f80d2bf..d603c1fe 100644 --- a/Linphone/view/Page/Form/Settings/AbstractSettingsMenu.qml +++ b/Linphone/view/Page/Form/Settings/AbstractSettingsMenu.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Effects import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp diff --git a/Linphone/view/Page/Form/Settings/AccountSettingsPage.qml b/Linphone/view/Page/Form/Settings/AccountSettingsPage.qml index 73a45913..f4a773b9 100644 --- a/Linphone/view/Page/Form/Settings/AccountSettingsPage.qml +++ b/Linphone/view/Page/Form/Settings/AccountSettingsPage.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Effects import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp 1.0 import SettingsCpp 1.0 diff --git a/Linphone/view/Page/Form/Settings/SettingsPage.qml b/Linphone/view/Page/Form/Settings/SettingsPage.qml index 201b4f86..559b8397 100644 --- a/Linphone/view/Page/Form/Settings/SettingsPage.qml +++ b/Linphone/view/Page/Form/Settings/SettingsPage.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Effects import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import SettingsCpp AbstractSettingsMenu { diff --git a/Linphone/view/Page/Layout/Login/LoginLayout.qml b/Linphone/view/Page/Layout/Login/LoginLayout.qml index 07e83cc9..3aca8dbd 100644 --- a/Linphone/view/Page/Layout/Login/LoginLayout.qml +++ b/Linphone/view/Page/Layout/Login/LoginLayout.qml @@ -2,9 +2,9 @@ * Qml template used for welcome and login/register pages **/ -import QtQuick 2.15 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.2 as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import Linphone diff --git a/Linphone/view/Page/Layout/Main/MainLayout.qml b/Linphone/view/Page/Layout/Main/MainLayout.qml index f1210ce2..77333414 100644 --- a/Linphone/view/Page/Layout/Main/MainLayout.qml +++ b/Linphone/view/Page/Layout/Main/MainLayout.qml @@ -3,9 +3,9 @@ **/ import QtCore -import QtQuick 2.15 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.2 as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import QtQuick.Effects import Linphone diff --git a/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml index 5c726a39..8892187b 100644 --- a/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml +++ b/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone diff --git a/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml b/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml index 7e00468e..27490be1 100644 --- a/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml +++ b/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml @@ -1,7 +1,7 @@ import QtCore import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Dialogs import Linphone import SettingsCpp 1.0 diff --git a/Linphone/view/Page/Layout/Settings/AccountSettingsParametersLayout.qml b/Linphone/view/Page/Layout/Settings/AccountSettingsParametersLayout.qml index 1529385f..5a4a8b4b 100644 --- a/Linphone/view/Page/Layout/Settings/AccountSettingsParametersLayout.qml +++ b/Linphone/view/Page/Layout/Settings/AccountSettingsParametersLayout.qml @@ -1,7 +1,7 @@ import QtCore import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Dialogs import Linphone import SettingsCpp 1.0 diff --git a/Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml index b9df7737..f5a543ad 100644 --- a/Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml +++ b/Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import SettingsCpp 1.0 diff --git a/Linphone/view/Page/Layout/Settings/ContactsSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/ContactsSettingsLayout.qml index c5b2b191..e14b30ed 100644 --- a/Linphone/view/Page/Layout/Settings/ContactsSettingsLayout.qml +++ b/Linphone/view/Page/Layout/Settings/ContactsSettingsLayout.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import SettingsCpp 1.0 import Linphone diff --git a/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml index 473c00db..347adca5 100644 --- a/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml +++ b/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import SettingsCpp 1.0 diff --git a/Linphone/view/Page/Layout/Settings/LdapSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/LdapSettingsLayout.qml index a8dd79fb..6ac0ccd1 100644 --- a/Linphone/view/Page/Layout/Settings/LdapSettingsLayout.qml +++ b/Linphone/view/Page/Layout/Settings/LdapSettingsLayout.qml @@ -1,7 +1,7 @@ import QtCore import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Dialogs import Linphone import SettingsCpp 1.0 diff --git a/Linphone/view/Page/Layout/Settings/SecuritySettingsLayout.qml b/Linphone/view/Page/Layout/Settings/SecuritySettingsLayout.qml index 6b942a7b..d2805dbd 100644 --- a/Linphone/view/Page/Layout/Settings/SecuritySettingsLayout.qml +++ b/Linphone/view/Page/Layout/Settings/SecuritySettingsLayout.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import SettingsCpp 1.0 import Linphone diff --git a/Linphone/view/Page/Main/AbstractMainPage.qml b/Linphone/view/Page/Main/AbstractMainPage.qml index 104410a1..a32a1da9 100644 --- a/Linphone/view/Page/Main/AbstractMainPage.qml +++ b/Linphone/view/Page/Main/AbstractMainPage.qml @@ -2,9 +2,9 @@ * Qml template used for overview pages : Calls, Contacts, Conversations, Meetings, Settings **/ -import QtQuick 2.15 -import QtQuick.Layouts 1.3 -import QtQuick.Controls as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp diff --git a/Linphone/view/Page/Main/Account/AccountListView.qml b/Linphone/view/Page/Main/Account/AccountListView.qml index 784dcf0e..fbf3efa9 100644 --- a/Linphone/view/Page/Main/Account/AccountListView.qml +++ b/Linphone/view/Page/Main/Account/AccountListView.qml @@ -1,7 +1,7 @@ import QtCore import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import QtQuick.Dialogs import Linphone diff --git a/Linphone/view/Page/Main/Call/CallPage.qml b/Linphone/view/Page/Main/Call/CallPage.qml index a4f1343f..91a3c345 100644 --- a/Linphone/view/Page/Main/Call/CallPage.qml +++ b/Linphone/view/Page/Main/Call/CallPage.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Effects import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp import SettingsCpp diff --git a/Linphone/view/Page/Main/Call/CallSettingsPanel.qml b/Linphone/view/Page/Main/Call/CallSettingsPanel.qml index 0e53f87a..8b212921 100644 --- a/Linphone/view/Page/Main/Call/CallSettingsPanel.qml +++ b/Linphone/view/Page/Main/Call/CallSettingsPanel.qml @@ -1,6 +1,6 @@ -import QtQuick 2.7 +import QtQuick import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone Control.Page { diff --git a/Linphone/view/Page/Main/Call/WaitingRoom.qml b/Linphone/view/Page/Main/Call/WaitingRoom.qml index b92c9c64..1599e37e 100644 --- a/Linphone/view/Page/Main/Call/WaitingRoom.qml +++ b/Linphone/view/Page/Main/Call/WaitingRoom.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Layouts import QtQuick.Effects -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp 1.0 import LinphoneAccountsCpp diff --git a/Linphone/view/Page/Main/Contact/ContactPage.qml b/Linphone/view/Page/Main/Contact/ContactPage.qml index 69430a37..46428a73 100644 --- a/Linphone/view/Page/Main/Contact/ContactPage.qml +++ b/Linphone/view/Page/Main/Contact/ContactPage.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Effects import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp import EnumsToStringCpp diff --git a/Linphone/view/Page/Main/Help/HelpPage.qml b/Linphone/view/Page/Main/Help/HelpPage.qml index 5c7e9eeb..62ad4352 100644 --- a/Linphone/view/Page/Main/Help/HelpPage.qml +++ b/Linphone/view/Page/Main/Help/HelpPage.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Effects import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp 1.0 import ConstantsCpp 1.0 diff --git a/Linphone/view/Page/Main/Meeting/MeetingPage.qml b/Linphone/view/Page/Main/Meeting/MeetingPage.qml index 8062595f..41ce82a1 100644 --- a/Linphone/view/Page/Main/Meeting/MeetingPage.qml +++ b/Linphone/view/Page/Main/Meeting/MeetingPage.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Effects import QtQuick.Layouts -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import UtilsCpp diff --git a/Linphone/view/Page/Main/Start/WelcomePage.qml b/Linphone/view/Page/Main/Start/WelcomePage.qml index 66fe6cc6..e66f9de4 100644 --- a/Linphone/view/Page/Main/Start/WelcomePage.qml +++ b/Linphone/view/Page/Main/Start/WelcomePage.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.2 as Control +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material as Control import Linphone diff --git a/Linphone/view/Page/Window/AbstractWindow.qml b/Linphone/view/Page/Window/AbstractWindow.qml index ae5ac004..713a2cd2 100644 --- a/Linphone/view/Page/Window/AbstractWindow.qml +++ b/Linphone/view/Page/Window/AbstractWindow.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.3 -import QtQuick.Controls +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls.Material import Linphone import UtilsCpp 1.0 import SettingsCpp 1.0 diff --git a/Linphone/view/Page/Window/Call/CallsWindow.qml b/Linphone/view/Page/Window/Call/CallsWindow.qml index 4dd9e44b..db76812b 100644 --- a/Linphone/view/Page/Window/Call/CallsWindow.qml +++ b/Linphone/view/Page/Window/Call/CallsWindow.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Layouts import QtQuick.Effects -import QtQuick.Controls as Control +import QtQuick.Controls.Material as Control import Linphone import EnumsToStringCpp 1.0 import UtilsCpp 1.0 diff --git a/Linphone/view/Page/Window/Main/MainWindow.qml b/Linphone/view/Page/Window/Main/MainWindow.qml index 40e4d22b..9cd23939 100644 --- a/Linphone/view/Page/Window/Main/MainWindow.qml +++ b/Linphone/view/Page/Window/Main/MainWindow.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Layouts 1.3 +import QtQuick +import QtQuick.Layouts import QtQuick.Window -import QtQuick.Controls +import QtQuick.Controls.Material import Linphone import UtilsCpp 1.0 import SettingsCpp 1.0 diff --git a/Linphone/view/Test/ItemsTest.qml b/Linphone/view/Test/ItemsTest.qml index f6159bcc..400171dc 100644 --- a/Linphone/view/Test/ItemsTest.qml +++ b/Linphone/view/Test/ItemsTest.qml @@ -1,5 +1,5 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.2 as Control +import QtQuick +import QtQuick.Controls.Material as Control import QtQuick.Layouts import Linphone @@ -142,4 +142,4 @@ Window { } } -} \ No newline at end of file +}