diff --git a/Linphone/view/Control/Button/CalendarComboBox.qml b/Linphone/view/Control/Button/CalendarComboBox.qml index 67475a701..d2897b94d 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 2c5cbfa2b..bc7a350c0 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 26a5617a5..7ebbc5a75 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 714f444f3..43d8a22cd 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 94abf3074..7b8fb7677 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 d5a0a04e3..bc0d627b6 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 891bcf189..a8e182867 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 37dde784f..191f4b654 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 af67eea72..8034892ee 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 104c42173..976d6bcf0 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 216cc05b6..cb1f977f0 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 950ef251d..98917b95a 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 2e88898e2..25ca2c417 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 9b16bea9e..2f0b57bce 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 1959dacb9..94a3938e2 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 30bd351aa..4a159b1e7 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 9269475f5..35d78b584 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 39ea45878..6bb28625f 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 7cbdee4c2..7a516f983 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 3a6fb5954..770704220 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 e6e2d6297..38d012a81 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 273c3167d..be72842ad 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 a73d3a066..43dbc91b7 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 8fec3c616..771d32ba7 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 f657f29bb..d6cad8880 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 18790ebaf..4e3624abf 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 ed9d684e7..93305356d 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 88e490e18..66dbf2f6b 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 f8d110702..a1d250e4c 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 1ba482fcf..bfa3c6045 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 9b2f629e8..2cb8b709d 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 ec4b2baea..e62261abd 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 947e4b7ee..37646bfe5 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 edb23a08c..1bbb7f953 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 f5377f214..63788cfa8 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 d9e020480..e7f1c51d9 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 b5722852c..879683ca6 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 3600cd030..4e01a1ef9 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 7241626f5..da1487dfa 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 674f903c7..fa1acedff 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 0115afade..d9551ecfa 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 dbe7ba90c..e713d5081 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 e56066a27..f7cb25643 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 eaec4c60c..1ee14c199 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 c1084f1b1..e6f663fed 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 f30501ca7..e2039c537 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 527462034..f99cfb895 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 42af087c3..4183fa781 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 f6e7e8e66..8ebf7b3ab 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 cdcc0471a..1540cc4e6 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 a4d751a20..4e08f60b4 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 99e272ce9..c91e36cf9 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 c072aa8a1..28aa35a00 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 c85d765e0..45e14f477 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 0076e3ebd..4eb6636f4 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 66b74fa96..11c8f26dc 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 15c8d108b..8eecf9997 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 8c70c0363..535ae688a 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 ad7b42453..fb62bf28b 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 496da91b5..46dbcebc8 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 2ad5a3003..b438f7ca2 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 77c23b958..0b0db98cd 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 4c98458f7..e5f4543db 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 099cd9830..7ec1ede46 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 dacfe128f..c4077a821 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 5f80d2bf2..d603c1fea 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 73a45913b..f4a773b97 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 201b4f866..559b83975 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 07e83cc96..3aca8dbdc 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 f1210ce2f..773334141 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 5c726a39e..8892187b8 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 7e00468e2..27490be12 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 1529385fa..5a4a8b4bd 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 b9df7737d..f5a543ad7 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 c5b2b191b..e14b30edb 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 473c00db7..347adca53 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 a8dd79fb9..6ac0ccd15 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 6b942a7ba..d2805dbd6 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 104410a16..a32a1da90 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 784dcf0ea..fbf3efa96 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 a4f1343fc..91a3c3454 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 0e53f87a5..8b2129213 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 b92c9c647..1599e37e8 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 69430a37b..46428a735 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 5c7e9eeb8..62ad43525 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 8062595f4..41ce82a13 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 66fe6cc6d..e66f9de42 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 ae5ac004e..713a2cd24 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 4dd9e44b0..db76812bf 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 40e4d22be..9cd239395 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 f6159bcc5..400171dc1 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 +}