From fcb56bfb873b29b970a93da6e5c9cc0e3e5b8ebf Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Wed, 17 Mar 2021 14:23:21 -0400
Subject: [PATCH] misc: qml module import clean up
The main reason for this change is to remove the misusage
of QQuick one in ElidedTextLabel and useless QQuick one
module import
Change-Id: Ie296c0f7a90c6ec26ab85bcf3d8b75393463fbed
---
src/MainApplicationWindow.qml | 1 +
.../AccountMigrationDialog.qml | 1 +
src/commoncomponents/BaseContextMenu.qml | 1 +
src/commoncomponents/DaemonReconnectPopup.qml | 1 +
src/commoncomponents/DeleteAccountDialog.qml | 2 +-
src/commoncomponents/ElidedTextLabel.qml | 3 ++-
src/commoncomponents/GeneralMenuItem.qml | 1 +
src/commoncomponents/GeneralMenuSeparator.qml | 1 +
src/commoncomponents/InfoLineEdit.qml | 20 ++++++++++++++++++-
src/commoncomponents/JamiFileDialog.qml | 1 +
src/commoncomponents/ListViewJami.qml | 2 +-
src/commoncomponents/LookupStatusLabel.qml | 1 +
src/commoncomponents/MaterialButton.qml | 1 +
src/commoncomponents/MaterialLineEdit.qml | 1 +
src/commoncomponents/ModalPopup.qml | 1 +
src/commoncomponents/PasswordDialog.qml | 2 +-
src/commoncomponents/PhotoboothView.qml | 20 ++++++++++++++++++-
.../PreferenceItemDelegate.qml | 2 +-
src/commoncomponents/PresenceIndicator.qml | 1 +
src/commoncomponents/PushButton.qml | 1 +
src/commoncomponents/SettingParaCombobox.qml | 2 +-
src/commoncomponents/SimpleMessageDialog.qml | 1 +
src/commoncomponents/SpinnerButton.qml | 1 +
src/commoncomponents/UsernameLineEdit.qml | 1 +
src/constant/JamiStrings.qml | 1 +
src/constant/JamiTheme.qml | 4 ++--
src/mainview/MainView.qml | 1 +
src/mainview/components/AboutPopUp.qml | 1 +
src/mainview/components/AccountComboBox.qml | 1 +
.../components/AccountComboBoxPopup.qml | 1 +
src/mainview/components/AudioCallPage.qml | 1 +
src/mainview/components/CallOverlay.qml | 1 +
.../components/CallOverlayButtonGroup.qml | 1 +
src/mainview/components/CallStackView.qml | 1 +
.../components/CallViewContextMenu.qml | 1 +
src/mainview/components/ContactPicker.qml | 1 +
.../components/ContactPickerItemDelegate.qml | 1 +
src/mainview/components/ContactSearchBar.qml | 1 +
.../ConversationSmartListContextMenu.qml | 1 +
.../components/ConversationSmartListView.qml | 1 +
.../ConversationSmartListViewItemDelegate.qml | 1 +
src/mainview/components/IncomingCallPage.qml | 1 +
src/mainview/components/MessageWebView.qml | 1 +
.../components/MessageWebViewHeader.qml | 1 +
src/mainview/components/OutgoingCallPage.qml | 1 +
.../components/ParticipantOverlay.qml | 1 +
.../components/ParticipantOverlayMenu.qml | 1 +
.../components/PluginHandlerItemDelegate.qml | 2 +-
.../components/PluginHandlerPicker.qml | 1 +
.../components/ProjectCreditsScrollView.qml | 1 +
src/mainview/components/RecordBox.qml | 2 +-
src/mainview/components/ScreenRubberBand.qml | 1 +
src/mainview/components/SelectScreen.qml | 1 +
src/mainview/components/SidePanel.qml | 1 +
src/mainview/components/SidePanelTabBar.qml | 1 +
src/mainview/components/SipInputPanel.qml | 1 +
src/mainview/components/UserInfoCallPage.qml | 1 +
src/mainview/components/UserProfile.qml | 1 +
.../VideoCallFullScreenWindowContainer.qml | 1 +
src/mainview/components/VideoCallPage.qml | 1 +
.../VideoCallPageContextMenuDeviceItem.qml | 1 +
src/mainview/components/WelcomePage.qml | 1 +
.../components/WelcomePageQrDialog.qml | 1 +
src/settingsview/SettingsView.qml | 1 +
.../components/AccountProfile.qml | 2 +-
.../components/AdvancedCallSettings.qml | 2 +-
.../AdvancedConnectivitySettings.qml | 2 +-
.../AdvancedJamiSecuritySettings.qml | 2 +-
.../components/AdvancedMediaSettings.qml | 2 +-
.../components/AdvancedNameServerSettings.qml | 2 +-
.../components/AdvancedOpenDHTSettings.qml | 2 +-
.../AdvancedPublicAddressSettings.qml | 2 +-
.../components/AdvancedSDPSettings.qml | 2 +-
.../AdvancedSIPSecuritySettings.qml | 2 +-
.../components/AdvancedSettings.qml | 2 +-
.../components/AdvancedVoiceMailSettings.qml | 2 +-
src/settingsview/components/AvSettingPage.qml | 2 +-
.../components/BannedContacts.qml | 2 +-
.../components/ChatviewSettings.qml | 2 +-
.../components/ContactItemDelegate.qml | 2 +-
.../components/CurrentAccountSettings.qml | 2 +-
.../components/DeviceItemDelegate.qml | 2 +-
.../components/GeneralSettingsPage.qml | 1 +
.../components/JamiUserIdentity.qml | 2 +-
.../components/KeyBoardShortcutKey.qml | 19 ++++++++++++++++++
.../components/KeyBoardShortcutTable.qml | 1 +
src/settingsview/components/LevelMeter.qml | 1 +
.../components/LinkDeviceDialog.qml | 2 +-
src/settingsview/components/LinkedDevices.qml | 2 +-
.../components/MediaCodecDelegate.qml | 2 +-
src/settingsview/components/MediaSettings.qml | 2 +-
.../components/NameRegistrationDialog.qml | 2 +-
.../components/PluginItemDelegate.qml | 2 +-
.../components/PluginListPreferencesView.qml | 1 +
.../components/PluginListSettingsView.qml | 1 +
.../components/PluginSettingsPage.qml | 1 +
.../components/RecordingSettings.qml | 2 +-
.../components/RevokeDevicePasswordDialog.qml | 2 +-
.../components/SIPUserIdentity.qml | 2 +-
.../components/SettingMaterialButton.qml | 4 ++--
.../components/SettingSpinBox.qml | 2 +-
.../components/SettingsComboBox.qml | 2 +-
.../components/SettingsHeader.qml | 2 +-
.../components/SettingsMaterialLineEdit.qml | 2 +-
src/settingsview/components/SettingsMenu.qml | 1 +
.../components/SystemSettings.qml | 2 +-
src/settingsview/components/ToggleSwitch.qml | 2 +-
.../components/UpdateSettings.qml | 2 +-
src/settingsview/components/UserIdentity.qml | 2 +-
src/settingsview/components/VideoSettings.qml | 2 +-
src/wizardview/WizardView.qml | 1 +
.../AccountCreationStepIndicator.qml | 1 +
src/wizardview/components/BackupKeyPage.qml | 1 +
.../components/CollapsiblePasswordWidget.qml | 1 +
.../ConnectToAccountManagerPage.qml | 1 +
.../components/CreateAccountPage.qml | 1 +
.../components/CreateSIPAccountPage.qml | 1 +
.../components/ImportFromBackupPage.qml | 1 +
.../components/ImportFromDevicePage.qml | 1 +
src/wizardview/components/ProfilePage.qml | 1 +
src/wizardview/components/WelcomePage.qml | 1 +
121 files changed, 178 insertions(+), 51 deletions(-)
diff --git a/src/MainApplicationWindow.qml b/src/MainApplicationWindow.qml
index d92f9972b..9d89dd46f 100644
--- a/src/MainApplicationWindow.qml
+++ b/src/MainApplicationWindow.qml
@@ -26,6 +26,7 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
diff --git a/src/commoncomponents/AccountMigrationDialog.qml b/src/commoncomponents/AccountMigrationDialog.qml
index 8ef5fd979..536257de1 100644
--- a/src/commoncomponents/AccountMigrationDialog.qml
+++ b/src/commoncomponents/AccountMigrationDialog.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/BaseContextMenu.qml b/src/commoncomponents/BaseContextMenu.qml
index c0f59b296..da0b96397 100644
--- a/src/commoncomponents/BaseContextMenu.qml
+++ b/src/commoncomponents/BaseContextMenu.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Constants 1.0
Menu {
diff --git a/src/commoncomponents/DaemonReconnectPopup.qml b/src/commoncomponents/DaemonReconnectPopup.qml
index 631f9318a..9520e3a21 100644
--- a/src/commoncomponents/DaemonReconnectPopup.qml
+++ b/src/commoncomponents/DaemonReconnectPopup.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/DeleteAccountDialog.qml b/src/commoncomponents/DeleteAccountDialog.qml
index ba3a9608b..41093d42d 100644
--- a/src/commoncomponents/DeleteAccountDialog.qml
+++ b/src/commoncomponents/DeleteAccountDialog.qml
@@ -19,7 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/ElidedTextLabel.qml b/src/commoncomponents/ElidedTextLabel.qml
index 3d334b501..44e6b2dd1 100644
--- a/src/commoncomponents/ElidedTextLabel.qml
+++ b/src/commoncomponents/ElidedTextLabel.qml
@@ -17,7 +17,8 @@
*/
import QtQuick 2.14
-import QtQuick.Controls 1.4
+import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
Label {
diff --git a/src/commoncomponents/GeneralMenuItem.qml b/src/commoncomponents/GeneralMenuItem.qml
index d87a6b38c..577012214 100644
--- a/src/commoncomponents/GeneralMenuItem.qml
+++ b/src/commoncomponents/GeneralMenuItem.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Constants 1.0
// General menu item.
diff --git a/src/commoncomponents/GeneralMenuSeparator.qml b/src/commoncomponents/GeneralMenuSeparator.qml
index f719a2d5a..6ccac22e0 100644
--- a/src/commoncomponents/GeneralMenuSeparator.qml
+++ b/src/commoncomponents/GeneralMenuSeparator.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
MenuSeparator {
diff --git a/src/commoncomponents/InfoLineEdit.qml b/src/commoncomponents/InfoLineEdit.qml
index 752139313..07b16f68e 100644
--- a/src/commoncomponents/InfoLineEdit.qml
+++ b/src/commoncomponents/InfoLineEdit.qml
@@ -1,7 +1,25 @@
+/*
+ * Copyright (C) 2019-2020 by Savoir-faire Linux
+ * Author: Yang Wang <yang.wang@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Constants 1.0
TextField{
diff --git a/src/commoncomponents/JamiFileDialog.qml b/src/commoncomponents/JamiFileDialog.qml
index 0ba09a6bd..491d1a71d 100644
--- a/src/commoncomponents/JamiFileDialog.qml
+++ b/src/commoncomponents/JamiFileDialog.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import Qt.labs.platform 1.1
+
import net.jami.Constants 1.0
FileDialog {
diff --git a/src/commoncomponents/ListViewJami.qml b/src/commoncomponents/ListViewJami.qml
index be6e24aab..926555ad3 100644
--- a/src/commoncomponents/ListViewJami.qml
+++ b/src/commoncomponents/ListViewJami.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Constants 1.0
Rectangle {
diff --git a/src/commoncomponents/LookupStatusLabel.qml b/src/commoncomponents/LookupStatusLabel.qml
index e44a7f83c..5cc64d213 100644
--- a/src/commoncomponents/LookupStatusLabel.qml
+++ b/src/commoncomponents/LookupStatusLabel.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
Label {
diff --git a/src/commoncomponents/MaterialButton.qml b/src/commoncomponents/MaterialButton.qml
index 08dda0403..1e61e370a 100644
--- a/src/commoncomponents/MaterialButton.qml
+++ b/src/commoncomponents/MaterialButton.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
import QtQuick.Window 2.14
+
import net.jami.Constants 1.0
Button {
diff --git a/src/commoncomponents/MaterialLineEdit.qml b/src/commoncomponents/MaterialLineEdit.qml
index 31323dfab..5cf627ee7 100644
--- a/src/commoncomponents/MaterialLineEdit.qml
+++ b/src/commoncomponents/MaterialLineEdit.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Constants 1.0
TextField {
diff --git a/src/commoncomponents/ModalPopup.qml b/src/commoncomponents/ModalPopup.qml
index 7534204a8..95a3ae48d 100644
--- a/src/commoncomponents/ModalPopup.qml
+++ b/src/commoncomponents/ModalPopup.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Constants 1.0
Popup {
diff --git a/src/commoncomponents/PasswordDialog.qml b/src/commoncomponents/PasswordDialog.qml
index ccb56719d..082f2684e 100644
--- a/src/commoncomponents/PasswordDialog.qml
+++ b/src/commoncomponents/PasswordDialog.qml
@@ -19,7 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/PhotoboothView.qml b/src/commoncomponents/PhotoboothView.qml
index 35876c31d..69b0b504a 100644
--- a/src/commoncomponents/PhotoboothView.qml
+++ b/src/commoncomponents/PhotoboothView.qml
@@ -1,9 +1,27 @@
+/*
+ * Copyright (C) 2020 by Savoir-faire Linux
+ * Author: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/PreferenceItemDelegate.qml b/src/commoncomponents/PreferenceItemDelegate.qml
index 0a18830f8..752d885bc 100644
--- a/src/commoncomponents/PreferenceItemDelegate.qml
+++ b/src/commoncomponents/PreferenceItemDelegate.qml
@@ -21,9 +21,9 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
import QtQuick.Dialogs 1.3
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/PresenceIndicator.qml b/src/commoncomponents/PresenceIndicator.qml
index d3e95c935..d7baf7692 100644
--- a/src/commoncomponents/PresenceIndicator.qml
+++ b/src/commoncomponents/PresenceIndicator.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/PushButton.qml b/src/commoncomponents/PushButton.qml
index a75f5a71a..314d5df1b 100644
--- a/src/commoncomponents/PushButton.qml
+++ b/src/commoncomponents/PushButton.qml
@@ -20,6 +20,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Constants 1.0
//
diff --git a/src/commoncomponents/SettingParaCombobox.qml b/src/commoncomponents/SettingParaCombobox.qml
index 9e821e1d7..157e6d714 100644
--- a/src/commoncomponents/SettingParaCombobox.qml
+++ b/src/commoncomponents/SettingParaCombobox.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+import QtQml 2.14
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/SimpleMessageDialog.qml b/src/commoncomponents/SimpleMessageDialog.qml
index ca3857d30..f1c904beb 100644
--- a/src/commoncomponents/SimpleMessageDialog.qml
+++ b/src/commoncomponents/SimpleMessageDialog.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/commoncomponents/SpinnerButton.qml b/src/commoncomponents/SpinnerButton.qml
index a6a6cb299..05c7737fd 100644
--- a/src/commoncomponents/SpinnerButton.qml
+++ b/src/commoncomponents/SpinnerButton.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
MaterialButton {
diff --git a/src/commoncomponents/UsernameLineEdit.qml b/src/commoncomponents/UsernameLineEdit.qml
index 6b0aeaa4f..c454af954 100644
--- a/src/commoncomponents/UsernameLineEdit.qml
+++ b/src/commoncomponents/UsernameLineEdit.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Models 1.0
MaterialLineEdit {
diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml
index e08372c31..00ae1aa97 100644
--- a/src/constant/JamiStrings.qml
+++ b/src/constant/JamiStrings.qml
@@ -20,6 +20,7 @@
pragma Singleton
import QtQuick 2.14
+
import net.jami.Helpers 1.0
Item {
diff --git a/src/constant/JamiTheme.qml b/src/constant/JamiTheme.qml
index 5bc49f020..5552d29b4 100644
--- a/src/constant/JamiTheme.qml
+++ b/src/constant/JamiTheme.qml
@@ -19,11 +19,11 @@
// JamiTheme as a singleton is to provide global theme property entry.
pragma Singleton
+import QtQuick 2.14
+
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
-import QtQuick 2.14
-
Item {
property bool darkTheme: SettingsAdapter.getAppValue(Settings.EnableDarkTheme)
diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 35857a6f3..960c22a6e 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/AboutPopUp.qml b/src/mainview/components/AboutPopUp.qml
index 8b684d6b6..0919791f4 100644
--- a/src/mainview/components/AboutPopUp.qml
+++ b/src/mainview/components/AboutPopUp.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/AccountComboBox.qml b/src/mainview/components/AccountComboBox.qml
index 09994b88e..499f0f859 100644
--- a/src/mainview/components/AccountComboBox.qml
+++ b/src/mainview/components/AccountComboBox.qml
@@ -21,6 +21,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/AccountComboBoxPopup.qml b/src/mainview/components/AccountComboBoxPopup.qml
index 31c3d080a..a100ba42b 100644
--- a/src/mainview/components/AccountComboBoxPopup.qml
+++ b/src/mainview/components/AccountComboBoxPopup.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/AudioCallPage.qml b/src/mainview/components/AudioCallPage.qml
index 0005a1fe6..b9fcbad00 100644
--- a/src/mainview/components/AudioCallPage.qml
+++ b/src/mainview/components/AudioCallPage.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/CallOverlay.qml b/src/mainview/components/CallOverlay.qml
index fd0e9d7c0..aca0ae878 100644
--- a/src/mainview/components/CallOverlay.qml
+++ b/src/mainview/components/CallOverlay.qml
@@ -23,6 +23,7 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
import QtQml 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/CallOverlayButtonGroup.qml b/src/mainview/components/CallOverlayButtonGroup.qml
index 583d0cf21..344553922 100644
--- a/src/mainview/components/CallOverlayButtonGroup.qml
+++ b/src/mainview/components/CallOverlayButtonGroup.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
import QtQml 2.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/CallStackView.qml b/src/mainview/components/CallStackView.qml
index 265948fd1..ac48bc737 100644
--- a/src/mainview/components/CallStackView.qml
+++ b/src/mainview/components/CallStackView.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
diff --git a/src/mainview/components/CallViewContextMenu.qml b/src/mainview/components/CallViewContextMenu.qml
index 012fc9aad..408deb0f3 100644
--- a/src/mainview/components/CallViewContextMenu.qml
+++ b/src/mainview/components/CallViewContextMenu.qml
@@ -21,6 +21,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ContactPicker.qml b/src/mainview/components/ContactPicker.qml
index 4419a43f3..9bf98af6c 100644
--- a/src/mainview/components/ContactPicker.qml
+++ b/src/mainview/components/ContactPicker.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ContactPickerItemDelegate.qml b/src/mainview/components/ContactPickerItemDelegate.qml
index 2dae40ee4..bd3aa2379 100644
--- a/src/mainview/components/ContactPickerItemDelegate.qml
+++ b/src/mainview/components/ContactPickerItemDelegate.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ContactSearchBar.qml b/src/mainview/components/ContactSearchBar.qml
index 359a38dd4..96aba4723 100644
--- a/src/mainview/components/ContactSearchBar.qml
+++ b/src/mainview/components/ContactSearchBar.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ConversationSmartListContextMenu.qml b/src/mainview/components/ConversationSmartListContextMenu.qml
index 9f600940c..3a50fe36f 100644
--- a/src/mainview/components/ConversationSmartListContextMenu.qml
+++ b/src/mainview/components/ConversationSmartListContextMenu.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ConversationSmartListView.qml b/src/mainview/components/ConversationSmartListView.qml
index 4256c330d..7fe91f767 100644
--- a/src/mainview/components/ConversationSmartListView.qml
+++ b/src/mainview/components/ConversationSmartListView.qml
@@ -20,6 +20,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
diff --git a/src/mainview/components/ConversationSmartListViewItemDelegate.qml b/src/mainview/components/ConversationSmartListViewItemDelegate.qml
index a5c349b88..a7a4bc164 100644
--- a/src/mainview/components/ConversationSmartListViewItemDelegate.qml
+++ b/src/mainview/components/ConversationSmartListViewItemDelegate.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/IncomingCallPage.qml b/src/mainview/components/IncomingCallPage.qml
index dfc4b95c7..5efb73088 100644
--- a/src/mainview/components/IncomingCallPage.qml
+++ b/src/mainview/components/IncomingCallPage.qml
@@ -21,6 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/MessageWebView.qml b/src/mainview/components/MessageWebView.qml
index e55d28533..bf8a33eb9 100644
--- a/src/mainview/components/MessageWebView.qml
+++ b/src/mainview/components/MessageWebView.qml
@@ -21,6 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtWebEngine 1.10
import QtWebChannel 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/MessageWebViewHeader.qml b/src/mainview/components/MessageWebViewHeader.qml
index 282bbe943..d6192c80e 100644
--- a/src/mainview/components/MessageWebViewHeader.qml
+++ b/src/mainview/components/MessageWebViewHeader.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
import net.jami.Adapters 1.0
diff --git a/src/mainview/components/OutgoingCallPage.qml b/src/mainview/components/OutgoingCallPage.qml
index d418f81af..72023a0dc 100644
--- a/src/mainview/components/OutgoingCallPage.qml
+++ b/src/mainview/components/OutgoingCallPage.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ParticipantOverlay.qml b/src/mainview/components/ParticipantOverlay.qml
index 922c6214f..d74c9dd3a 100644
--- a/src/mainview/components/ParticipantOverlay.qml
+++ b/src/mainview/components/ParticipantOverlay.qml
@@ -23,6 +23,7 @@ import QtQuick.Layouts 1.14
import QtQuick.Shapes 1.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ParticipantOverlayMenu.qml b/src/mainview/components/ParticipantOverlayMenu.qml
index 7d11c32ff..78249d5fe 100644
--- a/src/mainview/components/ParticipantOverlayMenu.qml
+++ b/src/mainview/components/ParticipantOverlayMenu.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
import QtQuick.Layouts 1.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/PluginHandlerItemDelegate.qml b/src/mainview/components/PluginHandlerItemDelegate.qml
index 82d6a486a..19bdf469c 100644
--- a/src/mainview/components/PluginHandlerItemDelegate.qml
+++ b/src/mainview/components/PluginHandlerItemDelegate.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/PluginHandlerPicker.qml b/src/mainview/components/PluginHandlerPicker.qml
index d553de6d6..8ea38e208 100644
--- a/src/mainview/components/PluginHandlerPicker.qml
+++ b/src/mainview/components/PluginHandlerPicker.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ProjectCreditsScrollView.qml b/src/mainview/components/ProjectCreditsScrollView.qml
index 99bfcea99..2d53614b6 100644
--- a/src/mainview/components/ProjectCreditsScrollView.qml
+++ b/src/mainview/components/ProjectCreditsScrollView.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/RecordBox.qml b/src/mainview/components/RecordBox.qml
index 3c5cddb25..f9412e693 100644
--- a/src/mainview/components/RecordBox.qml
+++ b/src/mainview/components/RecordBox.qml
@@ -19,9 +19,9 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
import QtGraphicalEffects 1.14
import QtQuick.Shapes 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/ScreenRubberBand.qml b/src/mainview/components/ScreenRubberBand.qml
index 04704f9af..a20ec53b0 100644
--- a/src/mainview/components/ScreenRubberBand.qml
+++ b/src/mainview/components/ScreenRubberBand.qml
@@ -21,6 +21,7 @@ import QtQuick.Window 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/SelectScreen.qml b/src/mainview/components/SelectScreen.qml
index 4c5c10011..dcb262f46 100644
--- a/src/mainview/components/SelectScreen.qml
+++ b/src/mainview/components/SelectScreen.qml
@@ -21,6 +21,7 @@ import QtQuick.Window 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/SidePanel.qml b/src/mainview/components/SidePanel.qml
index 7ccf9f0fb..9686a761d 100644
--- a/src/mainview/components/SidePanel.qml
+++ b/src/mainview/components/SidePanel.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/SidePanelTabBar.qml b/src/mainview/components/SidePanelTabBar.qml
index dca27459e..980efbf61 100644
--- a/src/mainview/components/SidePanelTabBar.qml
+++ b/src/mainview/components/SidePanelTabBar.qml
@@ -21,6 +21,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/SipInputPanel.qml b/src/mainview/components/SipInputPanel.qml
index 20b2c1a30..b319b0304 100644
--- a/src/mainview/components/SipInputPanel.qml
+++ b/src/mainview/components/SipInputPanel.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/UserInfoCallPage.qml b/src/mainview/components/UserInfoCallPage.qml
index 8cd9cebf5..133d8a0d7 100644
--- a/src/mainview/components/UserInfoCallPage.qml
+++ b/src/mainview/components/UserInfoCallPage.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/UserProfile.qml b/src/mainview/components/UserProfile.qml
index 33aed722d..ac0690dcc 100644
--- a/src/mainview/components/UserProfile.qml
+++ b/src/mainview/components/UserProfile.qml
@@ -20,6 +20,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/mainview/components/VideoCallFullScreenWindowContainer.qml b/src/mainview/components/VideoCallFullScreenWindowContainer.qml
index 2c76179fe..cae72835e 100644
--- a/src/mainview/components/VideoCallFullScreenWindowContainer.qml
+++ b/src/mainview/components/VideoCallFullScreenWindowContainer.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Window 2.14
+
import net.jami.Models 1.0
Window {
diff --git a/src/mainview/components/VideoCallPage.qml b/src/mainview/components/VideoCallPage.qml
index e2e61062d..f600f18fa 100644
--- a/src/mainview/components/VideoCallPage.qml
+++ b/src/mainview/components/VideoCallPage.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml b/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml
index 4b13a4303..85754663f 100644
--- a/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml
+++ b/src/mainview/components/VideoCallPageContextMenuDeviceItem.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/WelcomePage.qml b/src/mainview/components/WelcomePage.qml
index 582b4114d..5b6c178b1 100644
--- a/src/mainview/components/WelcomePage.qml
+++ b/src/mainview/components/WelcomePage.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/mainview/components/WelcomePageQrDialog.qml b/src/mainview/components/WelcomePageQrDialog.qml
index 337d4c451..00be782d4 100644
--- a/src/mainview/components/WelcomePageQrDialog.qml
+++ b/src/mainview/components/WelcomePageQrDialog.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
diff --git a/src/settingsview/SettingsView.qml b/src/settingsview/SettingsView.qml
index 87af87a07..4ac5b063a 100644
--- a/src/settingsview/SettingsView.qml
+++ b/src/settingsview/SettingsView.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AccountProfile.qml b/src/settingsview/components/AccountProfile.qml
index 070b51702..8ce48df6b 100644
--- a/src/settingsview/components/AccountProfile.qml
+++ b/src/settingsview/components/AccountProfile.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedCallSettings.qml b/src/settingsview/components/AdvancedCallSettings.qml
index d3032e45a..fb567b145 100644
--- a/src/settingsview/components/AdvancedCallSettings.qml
+++ b/src/settingsview/components/AdvancedCallSettings.qml
@@ -22,8 +22,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedConnectivitySettings.qml b/src/settingsview/components/AdvancedConnectivitySettings.qml
index 9e0d1776a..21a1adb78 100644
--- a/src/settingsview/components/AdvancedConnectivitySettings.qml
+++ b/src/settingsview/components/AdvancedConnectivitySettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedJamiSecuritySettings.qml b/src/settingsview/components/AdvancedJamiSecuritySettings.qml
index d860ee2fe..75ad2bd2e 100644
--- a/src/settingsview/components/AdvancedJamiSecuritySettings.qml
+++ b/src/settingsview/components/AdvancedJamiSecuritySettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedMediaSettings.qml b/src/settingsview/components/AdvancedMediaSettings.qml
index 9d1c0c208..52d232906 100644
--- a/src/settingsview/components/AdvancedMediaSettings.qml
+++ b/src/settingsview/components/AdvancedMediaSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedNameServerSettings.qml b/src/settingsview/components/AdvancedNameServerSettings.qml
index 282f96807..c44a907fc 100644
--- a/src/settingsview/components/AdvancedNameServerSettings.qml
+++ b/src/settingsview/components/AdvancedNameServerSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedOpenDHTSettings.qml b/src/settingsview/components/AdvancedOpenDHTSettings.qml
index 771587a3a..30d8e6662 100644
--- a/src/settingsview/components/AdvancedOpenDHTSettings.qml
+++ b/src/settingsview/components/AdvancedOpenDHTSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedPublicAddressSettings.qml b/src/settingsview/components/AdvancedPublicAddressSettings.qml
index 6a4b7905a..b9be1abcf 100644
--- a/src/settingsview/components/AdvancedPublicAddressSettings.qml
+++ b/src/settingsview/components/AdvancedPublicAddressSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedSDPSettings.qml b/src/settingsview/components/AdvancedSDPSettings.qml
index dba6180fb..57252b711 100644
--- a/src/settingsview/components/AdvancedSDPSettings.qml
+++ b/src/settingsview/components/AdvancedSDPSettings.qml
@@ -21,9 +21,9 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.3
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedSIPSecuritySettings.qml b/src/settingsview/components/AdvancedSIPSecuritySettings.qml
index 4a61839db..bd56dc9ac 100644
--- a/src/settingsview/components/AdvancedSIPSecuritySettings.qml
+++ b/src/settingsview/components/AdvancedSIPSecuritySettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedSettings.qml b/src/settingsview/components/AdvancedSettings.qml
index b7141824a..f5b6eba5b 100644
--- a/src/settingsview/components/AdvancedSettings.qml
+++ b/src/settingsview/components/AdvancedSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AdvancedVoiceMailSettings.qml b/src/settingsview/components/AdvancedVoiceMailSettings.qml
index 8c83d4ece..07c3856de 100644
--- a/src/settingsview/components/AdvancedVoiceMailSettings.qml
+++ b/src/settingsview/components/AdvancedVoiceMailSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/AvSettingPage.qml b/src/settingsview/components/AvSettingPage.qml
index fa5e692c4..352d11080 100644
--- a/src/settingsview/components/AvSettingPage.qml
+++ b/src/settingsview/components/AvSettingPage.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/BannedContacts.qml b/src/settingsview/components/BannedContacts.qml
index 9c995d9fd..6ffd49fa4 100644
--- a/src/settingsview/components/BannedContacts.qml
+++ b/src/settingsview/components/BannedContacts.qml
@@ -21,8 +21,8 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/ChatviewSettings.qml b/src/settingsview/components/ChatviewSettings.qml
index f62de089a..9796e150d 100644
--- a/src/settingsview/components/ChatviewSettings.qml
+++ b/src/settingsview/components/ChatviewSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
diff --git a/src/settingsview/components/ContactItemDelegate.qml b/src/settingsview/components/ContactItemDelegate.qml
index 029a764f6..92a8ce1c7 100644
--- a/src/settingsview/components/ContactItemDelegate.qml
+++ b/src/settingsview/components/ContactItemDelegate.qml
@@ -22,7 +22,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/CurrentAccountSettings.qml b/src/settingsview/components/CurrentAccountSettings.qml
index f642d949c..cb8bc7853 100644
--- a/src/settingsview/components/CurrentAccountSettings.qml
+++ b/src/settingsview/components/CurrentAccountSettings.qml
@@ -21,9 +21,9 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.3
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/DeviceItemDelegate.qml b/src/settingsview/components/DeviceItemDelegate.qml
index e270618ce..ebc15bf66 100644
--- a/src/settingsview/components/DeviceItemDelegate.qml
+++ b/src/settingsview/components/DeviceItemDelegate.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/GeneralSettingsPage.qml b/src/settingsview/components/GeneralSettingsPage.qml
index c7d807e21..e08d8c9e6 100644
--- a/src/settingsview/components/GeneralSettingsPage.qml
+++ b/src/settingsview/components/GeneralSettingsPage.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import Qt.labs.platform 1.1
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
diff --git a/src/settingsview/components/JamiUserIdentity.qml b/src/settingsview/components/JamiUserIdentity.qml
index 11b041d08..b4ec1dd9d 100644
--- a/src/settingsview/components/JamiUserIdentity.qml
+++ b/src/settingsview/components/JamiUserIdentity.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/KeyBoardShortcutKey.qml b/src/settingsview/components/KeyBoardShortcutKey.qml
index 1def1f817..6652b21b6 100644
--- a/src/settingsview/components/KeyBoardShortcutKey.qml
+++ b/src/settingsview/components/KeyBoardShortcutKey.qml
@@ -1,5 +1,24 @@
+/*
+ * Copyright (C) 2019-2020 by Savoir-faire Linux
+ * Author: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
Item {
diff --git a/src/settingsview/components/KeyBoardShortcutTable.qml b/src/settingsview/components/KeyBoardShortcutTable.qml
index 240d21914..cbdc1ae9b 100644
--- a/src/settingsview/components/KeyBoardShortcutTable.qml
+++ b/src/settingsview/components/KeyBoardShortcutTable.qml
@@ -21,6 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/LevelMeter.qml b/src/settingsview/components/LevelMeter.qml
index b14b18df7..be3ed8c8e 100644
--- a/src/settingsview/components/LevelMeter.qml
+++ b/src/settingsview/components/LevelMeter.qml
@@ -18,6 +18,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
diff --git a/src/settingsview/components/LinkDeviceDialog.qml b/src/settingsview/components/LinkDeviceDialog.qml
index 3e1523450..f0de02c3c 100644
--- a/src/settingsview/components/LinkDeviceDialog.qml
+++ b/src/settingsview/components/LinkDeviceDialog.qml
@@ -20,7 +20,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/LinkedDevices.qml b/src/settingsview/components/LinkedDevices.qml
index 35fe2722a..fbf803c5f 100644
--- a/src/settingsview/components/LinkedDevices.qml
+++ b/src/settingsview/components/LinkedDevices.qml
@@ -22,8 +22,8 @@ import QtQuick.Controls.Universal 2.14
import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/MediaCodecDelegate.qml b/src/settingsview/components/MediaCodecDelegate.qml
index 0774e519d..278386d1a 100644
--- a/src/settingsview/components/MediaCodecDelegate.qml
+++ b/src/settingsview/components/MediaCodecDelegate.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/MediaSettings.qml b/src/settingsview/components/MediaSettings.qml
index cf451fed7..1463c0a32 100644
--- a/src/settingsview/components/MediaSettings.qml
+++ b/src/settingsview/components/MediaSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/NameRegistrationDialog.qml b/src/settingsview/components/NameRegistrationDialog.qml
index 9c39a0751..83768c58a 100644
--- a/src/settingsview/components/NameRegistrationDialog.qml
+++ b/src/settingsview/components/NameRegistrationDialog.qml
@@ -20,7 +20,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/PluginItemDelegate.qml b/src/settingsview/components/PluginItemDelegate.qml
index 8db65967e..5c254fd8e 100644
--- a/src/settingsview/components/PluginItemDelegate.qml
+++ b/src/settingsview/components/PluginItemDelegate.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/PluginListPreferencesView.qml b/src/settingsview/components/PluginListPreferencesView.qml
index bf986ca08..a7ee6f0fa 100644
--- a/src/settingsview/components/PluginListPreferencesView.qml
+++ b/src/settingsview/components/PluginListPreferencesView.qml
@@ -23,6 +23,7 @@ import QtQuick.Layouts 1.14
import Qt.labs.platform 1.1
import QtQuick.Dialogs 1.3
import QtGraphicalEffects 1.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/PluginListSettingsView.qml b/src/settingsview/components/PluginListSettingsView.qml
index 6c1fc640c..9b3110856 100644
--- a/src/settingsview/components/PluginListSettingsView.qml
+++ b/src/settingsview/components/PluginListSettingsView.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import Qt.labs.platform 1.1
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/PluginSettingsPage.qml b/src/settingsview/components/PluginSettingsPage.qml
index 0a4260e2d..111ecc712 100644
--- a/src/settingsview/components/PluginSettingsPage.qml
+++ b/src/settingsview/components/PluginSettingsPage.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import Qt.labs.platform 1.1
import QtGraphicalEffects 1.14
+
import net.jami.Adapters 1.0
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/RecordingSettings.qml b/src/settingsview/components/RecordingSettings.qml
index fcdd4e5c6..d3d999c01 100644
--- a/src/settingsview/components/RecordingSettings.qml
+++ b/src/settingsview/components/RecordingSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/RevokeDevicePasswordDialog.qml b/src/settingsview/components/RevokeDevicePasswordDialog.qml
index d78bb1765..32e827a98 100644
--- a/src/settingsview/components/RevokeDevicePasswordDialog.qml
+++ b/src/settingsview/components/RevokeDevicePasswordDialog.qml
@@ -20,7 +20,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/settingsview/components/SIPUserIdentity.qml b/src/settingsview/components/SIPUserIdentity.qml
index 5f8e57895..76684329e 100644
--- a/src/settingsview/components/SIPUserIdentity.qml
+++ b/src/settingsview/components/SIPUserIdentity.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/SettingMaterialButton.qml b/src/settingsview/components/SettingMaterialButton.qml
index cf3b7421f..187c8326c 100644
--- a/src/settingsview/components/SettingMaterialButton.qml
+++ b/src/settingsview/components/SettingMaterialButton.qml
@@ -21,9 +21,9 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
-import net.jami.Models 1.0
import Qt.labs.platform 1.1
+
+import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/SettingSpinBox.qml b/src/settingsview/components/SettingSpinBox.qml
index d7cd17d7f..58d4d67c8 100644
--- a/src/settingsview/components/SettingSpinBox.qml
+++ b/src/settingsview/components/SettingSpinBox.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/SettingsComboBox.qml b/src/settingsview/components/SettingsComboBox.qml
index 5fc1a1a6a..5b95b24cc 100644
--- a/src/settingsview/components/SettingsComboBox.qml
+++ b/src/settingsview/components/SettingsComboBox.qml
@@ -22,7 +22,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/settingsview/components/SettingsHeader.qml b/src/settingsview/components/SettingsHeader.qml
index 0dc8be3a2..f7b6b60fd 100644
--- a/src/settingsview/components/SettingsHeader.qml
+++ b/src/settingsview/components/SettingsHeader.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/SettingsMaterialLineEdit.qml b/src/settingsview/components/SettingsMaterialLineEdit.qml
index d98501ece..2a31b8739 100644
--- a/src/settingsview/components/SettingsMaterialLineEdit.qml
+++ b/src/settingsview/components/SettingsMaterialLineEdit.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/SettingsMenu.qml b/src/settingsview/components/SettingsMenu.qml
index 4da59c755..cb820a968 100644
--- a/src/settingsview/components/SettingsMenu.qml
+++ b/src/settingsview/components/SettingsMenu.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/SystemSettings.qml b/src/settingsview/components/SystemSettings.qml
index e9520a583..4737cdea2 100644
--- a/src/settingsview/components/SystemSettings.qml
+++ b/src/settingsview/components/SystemSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
diff --git a/src/settingsview/components/ToggleSwitch.qml b/src/settingsview/components/ToggleSwitch.qml
index 052bd4e6d..9fc1dc336 100644
--- a/src/settingsview/components/ToggleSwitch.qml
+++ b/src/settingsview/components/ToggleSwitch.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/settingsview/components/UpdateSettings.qml b/src/settingsview/components/UpdateSettings.qml
index 3005c7c80..0df5bf118 100644
--- a/src/settingsview/components/UpdateSettings.qml
+++ b/src/settingsview/components/UpdateSettings.qml
@@ -19,9 +19,9 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
-import QtQuick.Controls.Styles 1.4
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
+
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
import net.jami.Models 1.0
diff --git a/src/settingsview/components/UserIdentity.qml b/src/settingsview/components/UserIdentity.qml
index dc901b25a..c9732a3de 100644
--- a/src/settingsview/components/UserIdentity.qml
+++ b/src/settingsview/components/UserIdentity.qml
@@ -21,8 +21,8 @@ import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/settingsview/components/VideoSettings.qml b/src/settingsview/components/VideoSettings.qml
index 6e3c301f6..8680ae485 100644
--- a/src/settingsview/components/VideoSettings.qml
+++ b/src/settingsview/components/VideoSettings.qml
@@ -21,8 +21,8 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
-import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Enums 1.0
diff --git a/src/wizardview/WizardView.qml b/src/wizardview/WizardView.qml
index 655fd6525..c1e7f7a88 100644
--- a/src/wizardview/WizardView.qml
+++ b/src/wizardview/WizardView.qml
@@ -21,6 +21,7 @@ import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/wizardview/components/AccountCreationStepIndicator.qml b/src/wizardview/components/AccountCreationStepIndicator.qml
index c81a92e8c..37daaf0e2 100644
--- a/src/wizardview/components/AccountCreationStepIndicator.qml
+++ b/src/wizardview/components/AccountCreationStepIndicator.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/wizardview/components/BackupKeyPage.qml b/src/wizardview/components/BackupKeyPage.qml
index fbbdf765c..cf69527f3 100644
--- a/src/wizardview/components/BackupKeyPage.qml
+++ b/src/wizardview/components/BackupKeyPage.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/wizardview/components/CollapsiblePasswordWidget.qml b/src/wizardview/components/CollapsiblePasswordWidget.qml
index 5a34ca5e3..c9bf8f645 100644
--- a/src/wizardview/components/CollapsiblePasswordWidget.qml
+++ b/src/wizardview/components/CollapsiblePasswordWidget.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/wizardview/components/ConnectToAccountManagerPage.qml b/src/wizardview/components/ConnectToAccountManagerPage.qml
index bf4d69c77..ae2610aed 100644
--- a/src/wizardview/components/ConnectToAccountManagerPage.qml
+++ b/src/wizardview/components/ConnectToAccountManagerPage.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/wizardview/components/CreateAccountPage.qml b/src/wizardview/components/CreateAccountPage.qml
index 2a45f80f3..af6426f82 100644
--- a/src/wizardview/components/CreateAccountPage.qml
+++ b/src/wizardview/components/CreateAccountPage.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/wizardview/components/CreateSIPAccountPage.qml b/src/wizardview/components/CreateSIPAccountPage.qml
index 81eae576b..a6b8d389c 100644
--- a/src/wizardview/components/CreateSIPAccountPage.qml
+++ b/src/wizardview/components/CreateSIPAccountPage.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/wizardview/components/ImportFromBackupPage.qml b/src/wizardview/components/ImportFromBackupPage.qml
index 454dbbab3..f1078d521 100644
--- a/src/wizardview/components/ImportFromBackupPage.qml
+++ b/src/wizardview/components/ImportFromBackupPage.qml
@@ -20,6 +20,7 @@ import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import Qt.labs.platform 1.1
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
diff --git a/src/wizardview/components/ImportFromDevicePage.qml b/src/wizardview/components/ImportFromDevicePage.qml
index 66886d62e..3f15c6617 100644
--- a/src/wizardview/components/ImportFromDevicePage.qml
+++ b/src/wizardview/components/ImportFromDevicePage.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+
import net.jami.Models 1.0
import net.jami.Constants 1.0
diff --git a/src/wizardview/components/ProfilePage.qml b/src/wizardview/components/ProfilePage.qml
index cd7e72f2d..79b6c1641 100644
--- a/src/wizardview/components/ProfilePage.qml
+++ b/src/wizardview/components/ProfilePage.qml
@@ -19,6 +19,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
+
import net.jami.Constants 1.0
import "../../commoncomponents"
diff --git a/src/wizardview/components/WelcomePage.qml b/src/wizardview/components/WelcomePage.qml
index f44a99680..48ba545b5 100644
--- a/src/wizardview/components/WelcomePage.qml
+++ b/src/wizardview/components/WelcomePage.qml
@@ -21,6 +21,7 @@ import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
+
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
--
GitLab