From a2b5e77568876f0b61feb3aa3a15415d39534bfb Mon Sep 17 00:00:00 2001 From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> Date: Mon, 23 Aug 2021 18:43:53 -0400 Subject: [PATCH] misc: cleanup QML import modules Change-Id: Ia344d9f57a216f2d27ef40153af2d6bd787bfb77 --- src/DaemonReconnectWindow.qml | 1 - src/commoncomponents/AccountMigrationDialog.qml | 2 -- src/commoncomponents/Avatar.qml | 1 - src/commoncomponents/GeneralWebEngineView.qml | 1 - src/commoncomponents/LineEditContextMenu.qml | 2 -- src/commoncomponents/ListViewJami.qml | 3 --- src/commoncomponents/PasswordDialog.qml | 1 - src/commoncomponents/PhotoboothView.qml | 1 - src/commoncomponents/PreferenceItemDelegate.qml | 4 ---- src/commoncomponents/PresenceIndicator.qml | 1 - src/commoncomponents/PushButton.qml | 1 - src/commoncomponents/ResponsiveImage.qml | 1 - src/commoncomponents/SettingParaCombobox.qml | 4 ---- src/commoncomponents/SpinnerButton.qml | 3 --- src/commoncomponents/SpinningAnimation.qml | 1 - src/commoncomponents/UsernameLineEdit.qml | 1 - src/commoncomponents/contextmenu/ContextMenuAutoLoader.qml | 7 ------- src/commoncomponents/contextmenu/GeneralMenuItem.qml | 1 - src/mainview/MainView.qml | 3 --- src/mainview/components/AccountComboBox.qml | 1 - src/mainview/components/CallOverlay.qml | 4 ---- src/mainview/components/CallStackView.qml | 2 -- src/mainview/components/CallViewContextMenu.qml | 2 -- src/mainview/components/ContactPicker.qml | 1 - src/mainview/components/ContactPickerItemDelegate.qml | 1 - src/mainview/components/ContactSearchBar.qml | 2 -- src/mainview/components/ConversationListView.qml | 1 - .../components/ConversationSmartListContextMenu.qml | 2 -- src/mainview/components/FilesToSendContainer.qml | 1 - src/mainview/components/FilesToSendDelegate.qml | 1 - src/mainview/components/InitialCallPage.qml | 2 -- src/mainview/components/InvitationView.qml | 2 -- src/mainview/components/MainOverlay.qml | 3 --- src/mainview/components/MessageBar.qml | 1 - src/mainview/components/MessageWebViewFooter.qml | 1 - src/mainview/components/MessageWebViewHeader.qml | 1 - src/mainview/components/OngoingCallPage.qml | 1 - .../components/ParticipantCallInStatusDelegate.qml | 1 - src/mainview/components/ParticipantCallInStatusView.qml | 1 - src/mainview/components/ParticipantControlLayout.qml | 1 - src/mainview/components/ParticipantOverlay.qml | 3 --- src/mainview/components/ParticipantsLayer.qml | 1 - src/mainview/components/PluginHandlerItemDelegate.qml | 2 -- src/mainview/components/PluginHandlerPicker.qml | 1 - src/mainview/components/ScreenRubberBand.qml | 3 --- src/mainview/components/SelectScreen.qml | 2 -- src/mainview/components/SidePanel.qml | 2 -- src/mainview/components/SidePanelTabBar.qml | 3 --- src/mainview/components/SipInputPanel.qml | 1 - src/mainview/components/UserProfile.qml | 1 - src/mainview/components/WelcomePageQrDialog.qml | 3 --- src/settingsview/SettingsView.qml | 3 --- src/settingsview/components/AccountProfile.qml | 4 ---- src/settingsview/components/AdvancedCallSettings.qml | 4 ---- src/settingsview/components/AdvancedChatSettings.qml | 1 - .../components/AdvancedConnectivitySettings.qml | 4 ---- .../components/AdvancedJamiSecuritySettings.qml | 4 ---- src/settingsview/components/AdvancedMediaSettings.qml | 3 --- src/settingsview/components/AdvancedNameServerSettings.qml | 4 ---- src/settingsview/components/AdvancedOpenDHTSettings.qml | 4 ---- .../components/AdvancedPublicAddressSettings.qml | 4 ---- src/settingsview/components/AdvancedSDPSettings.qml | 5 ----- .../components/AdvancedSIPSecuritySettings.qml | 3 --- src/settingsview/components/AdvancedSettings.qml | 4 ---- src/settingsview/components/AdvancedVoiceMailSettings.qml | 3 --- src/settingsview/components/AvSettingPage.qml | 3 --- src/settingsview/components/BannedContacts.qml | 4 ---- src/settingsview/components/ChatviewSettings.qml | 5 ++--- src/settingsview/components/ContactItemDelegate.qml | 2 -- src/settingsview/components/CurrentAccountSettings.qml | 3 --- src/settingsview/components/DeviceItemDelegate.qml | 1 - src/settingsview/components/GeneralSettingsPage.qml | 4 ---- src/settingsview/components/JamiUserIdentity.qml | 3 --- src/settingsview/components/KeyBoardShortcutKey.qml | 1 - src/settingsview/components/LinkedDevices.qml | 4 ---- src/settingsview/components/LogsView.qml | 2 -- src/settingsview/components/MediaCodecDelegate.qml | 1 - src/settingsview/components/MediaSettings.qml | 3 --- src/settingsview/components/PluginItemDelegate.qml | 2 -- src/settingsview/components/PluginListPreferencesView.qml | 4 ---- src/settingsview/components/PluginListSettingsView.qml | 2 -- src/settingsview/components/PluginSettingsPage.qml | 3 --- src/settingsview/components/RecordingSettings.qml | 2 -- src/settingsview/components/SIPUserIdentity.qml | 4 ---- src/settingsview/components/SettingMaterialButton.qml | 4 ---- src/settingsview/components/SettingSpinBox.qml | 3 --- src/settingsview/components/SettingsComboBox.qml | 4 ---- src/settingsview/components/SettingsHeader.qml | 2 -- src/settingsview/components/SettingsMaterialLineEdit.qml | 4 ---- src/settingsview/components/SettingsMenu.qml | 1 - src/settingsview/components/SystemSettings.qml | 2 -- src/settingsview/components/ToggleSwitch.qml | 2 -- src/settingsview/components/TroubleshootSettings.qml | 1 - src/settingsview/components/UpdateSettings.qml | 1 - src/settingsview/components/UserIdentity.qml | 4 ---- src/settingsview/components/VideoSettings.qml | 2 -- src/wizardview/WizardView.qml | 2 -- src/wizardview/components/AccountCreationStepIndicator.qml | 2 -- src/wizardview/components/CreateAccountPage.qml | 1 - src/wizardview/components/WelcomePage.qml | 2 -- 100 files changed, 2 insertions(+), 231 deletions(-) diff --git a/src/DaemonReconnectWindow.qml b/src/DaemonReconnectWindow.qml index 34ce0a8e8..f751d9b6a 100644 --- a/src/DaemonReconnectWindow.qml +++ b/src/DaemonReconnectWindow.qml @@ -17,7 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Window 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls.Universal 2.14 diff --git a/src/commoncomponents/AccountMigrationDialog.qml b/src/commoncomponents/AccountMigrationDialog.qml index 525b12b10..2cf1c856b 100644 --- a/src/commoncomponents/AccountMigrationDialog.qml +++ b/src/commoncomponents/AccountMigrationDialog.qml @@ -19,9 +19,7 @@ import QtQuick 2.14 import QtQuick.Window 2.14 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.1 import net.jami.Adapters 1.1 diff --git a/src/commoncomponents/Avatar.qml b/src/commoncomponents/Avatar.qml index 87b5218df..b4a60f685 100644 --- a/src/commoncomponents/Avatar.qml +++ b/src/commoncomponents/Avatar.qml @@ -23,7 +23,6 @@ import QtQuick.Controls 2.14 import net.jami.Adapters 1.1 import net.jami.Constants 1.1 import net.jami.Helpers 1.1 -import net.jami.Models 1.1 Item { id: root diff --git a/src/commoncomponents/GeneralWebEngineView.qml b/src/commoncomponents/GeneralWebEngineView.qml index be43f059e..f1accda19 100644 --- a/src/commoncomponents/GeneralWebEngineView.qml +++ b/src/commoncomponents/GeneralWebEngineView.qml @@ -17,7 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import QtWebEngine 1.10 import QtWebChannel 1.14 diff --git a/src/commoncomponents/LineEditContextMenu.qml b/src/commoncomponents/LineEditContextMenu.qml index 66f0f5f15..9e633b0b0 100644 --- a/src/commoncomponents/LineEditContextMenu.qml +++ b/src/commoncomponents/LineEditContextMenu.qml @@ -17,8 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 -import QtGraphicalEffects 1.14 import net.jami.Constants 1.1 diff --git a/src/commoncomponents/ListViewJami.qml b/src/commoncomponents/ListViewJami.qml index 57ec8d2b4..ceccc88ec 100644 --- a/src/commoncomponents/ListViewJami.qml +++ b/src/commoncomponents/ListViewJami.qml @@ -18,9 +18,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 import net.jami.Constants 1.1 diff --git a/src/commoncomponents/PasswordDialog.qml b/src/commoncomponents/PasswordDialog.qml index 0711616c0..2c75de9d1 100644 --- a/src/commoncomponents/PasswordDialog.qml +++ b/src/commoncomponents/PasswordDialog.qml @@ -17,7 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import net.jami.Adapters 1.1 diff --git a/src/commoncomponents/PhotoboothView.qml b/src/commoncomponents/PhotoboothView.qml index 381861d15..3e0aaf080 100644 --- a/src/commoncomponents/PhotoboothView.qml +++ b/src/commoncomponents/PhotoboothView.qml @@ -17,7 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import Qt.labs.platform 1.1 import QtGraphicalEffects 1.14 diff --git a/src/commoncomponents/PreferenceItemDelegate.qml b/src/commoncomponents/PreferenceItemDelegate.qml index 490a12cfa..a89c40745 100644 --- a/src/commoncomponents/PreferenceItemDelegate.qml +++ b/src/commoncomponents/PreferenceItemDelegate.qml @@ -18,11 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 -import QtQuick.Dialogs 1.3 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/commoncomponents/PresenceIndicator.qml b/src/commoncomponents/PresenceIndicator.qml index c3269ca18..95be91bfa 100644 --- a/src/commoncomponents/PresenceIndicator.qml +++ b/src/commoncomponents/PresenceIndicator.qml @@ -17,7 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import net.jami.Models 1.1 import net.jami.Constants 1.1 diff --git a/src/commoncomponents/PushButton.qml b/src/commoncomponents/PushButton.qml index a147d49fc..8420a7a0d 100644 --- a/src/commoncomponents/PushButton.qml +++ b/src/commoncomponents/PushButton.qml @@ -19,7 +19,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtGraphicalEffects 1.14 import net.jami.Constants 1.1 diff --git a/src/commoncomponents/ResponsiveImage.qml b/src/commoncomponents/ResponsiveImage.qml index fb6e5e9fd..faee0e997 100644 --- a/src/commoncomponents/ResponsiveImage.qml +++ b/src/commoncomponents/ResponsiveImage.qml @@ -17,7 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import QtGraphicalEffects 1.14 import net.jami.Constants 1.1 diff --git a/src/commoncomponents/SettingParaCombobox.qml b/src/commoncomponents/SettingParaCombobox.qml index 536244a82..299d4bfac 100644 --- a/src/commoncomponents/SettingParaCombobox.qml +++ b/src/commoncomponents/SettingParaCombobox.qml @@ -18,10 +18,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 -import QtQml 2.14 import net.jami.Constants 1.1 diff --git a/src/commoncomponents/SpinnerButton.qml b/src/commoncomponents/SpinnerButton.qml index ed4240381..c9977d012 100644 --- a/src/commoncomponents/SpinnerButton.qml +++ b/src/commoncomponents/SpinnerButton.qml @@ -16,9 +16,6 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.14 -import QtQuick.Controls 2.14 - import net.jami.Constants 1.1 MaterialButton { diff --git a/src/commoncomponents/SpinningAnimation.qml b/src/commoncomponents/SpinningAnimation.qml index d0edd4c14..38d3f04a7 100644 --- a/src/commoncomponents/SpinningAnimation.qml +++ b/src/commoncomponents/SpinningAnimation.qml @@ -18,7 +18,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import QtGraphicalEffects 1.12 Item { diff --git a/src/commoncomponents/UsernameLineEdit.qml b/src/commoncomponents/UsernameLineEdit.qml index 649c865ac..41c02187a 100644 --- a/src/commoncomponents/UsernameLineEdit.qml +++ b/src/commoncomponents/UsernameLineEdit.qml @@ -17,7 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import QtGraphicalEffects 1.14 import net.jami.Models 1.1 diff --git a/src/commoncomponents/contextmenu/ContextMenuAutoLoader.qml b/src/commoncomponents/contextmenu/ContextMenuAutoLoader.qml index 1916c6eab..3e9a482cf 100644 --- a/src/commoncomponents/contextmenu/ContextMenuAutoLoader.qml +++ b/src/commoncomponents/contextmenu/ContextMenuAutoLoader.qml @@ -17,14 +17,7 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 -import QtGraphicalEffects 1.14 -import net.jami.Models 1.1 -import net.jami.Adapters 1.1 -import net.jami.Constants 1.1 - -import "../../commoncomponents" import "../../commoncomponents/contextmenu" Loader { diff --git a/src/commoncomponents/contextmenu/GeneralMenuItem.qml b/src/commoncomponents/contextmenu/GeneralMenuItem.qml index 73c1f01e0..298b6afb8 100644 --- a/src/commoncomponents/contextmenu/GeneralMenuItem.qml +++ b/src/commoncomponents/contextmenu/GeneralMenuItem.qml @@ -19,7 +19,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 import net.jami.Constants 1.1 diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml index 1bf9716ca..f2c03e808 100644 --- a/src/mainview/MainView.qml +++ b/src/mainview/MainView.qml @@ -17,11 +17,8 @@ */ import QtQuick 2.14 -import QtQuick.Window 2.14 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.1 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/AccountComboBox.qml b/src/mainview/components/AccountComboBox.qml index 3ee58b57d..d42201ca7 100644 --- a/src/mainview/components/AccountComboBox.qml +++ b/src/mainview/components/AccountComboBox.qml @@ -20,7 +20,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/CallOverlay.qml b/src/mainview/components/CallOverlay.qml index 0ac014467..062f80916 100644 --- a/src/mainview/components/CallOverlay.qml +++ b/src/mainview/components/CallOverlay.qml @@ -19,10 +19,6 @@ */ import QtQuick 2.14 -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.1 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/CallStackView.qml b/src/mainview/components/CallStackView.qml index d6a0b1c75..d8b3f0968 100644 --- a/src/mainview/components/CallStackView.qml +++ b/src/mainview/components/CallStackView.qml @@ -18,8 +18,6 @@ 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.1 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/CallViewContextMenu.qml b/src/mainview/components/CallViewContextMenu.qml index e2071f6f3..96914e787 100644 --- a/src/mainview/components/CallViewContextMenu.qml +++ b/src/mainview/components/CallViewContextMenu.qml @@ -19,8 +19,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 -import QtGraphicalEffects 1.14 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/ContactPicker.qml b/src/mainview/components/ContactPicker.qml index 4a74b88d8..ef9361fae 100644 --- a/src/mainview/components/ContactPicker.qml +++ b/src/mainview/components/ContactPicker.qml @@ -19,7 +19,6 @@ 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.1 import net.jami.Models 1.1 diff --git a/src/mainview/components/ContactPickerItemDelegate.qml b/src/mainview/components/ContactPickerItemDelegate.qml index ceb7b3d14..7ee7b7fef 100644 --- a/src/mainview/components/ContactPickerItemDelegate.qml +++ b/src/mainview/components/ContactPickerItemDelegate.qml @@ -18,7 +18,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Layouts 1.14 import net.jami.Adapters 1.1 import net.jami.Models 1.1 diff --git a/src/mainview/components/ContactSearchBar.qml b/src/mainview/components/ContactSearchBar.qml index d2b650cd0..3c5d5cbf8 100644 --- a/src/mainview/components/ContactSearchBar.qml +++ b/src/mainview/components/ContactSearchBar.qml @@ -18,8 +18,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 import net.jami.Models 1.1 import net.jami.Constants 1.1 diff --git a/src/mainview/components/ConversationListView.qml b/src/mainview/components/ConversationListView.qml index b61356c2f..0b8747b7d 100644 --- a/src/mainview/components/ConversationListView.qml +++ b/src/mainview/components/ConversationListView.qml @@ -19,7 +19,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Layouts 1.14 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/ConversationSmartListContextMenu.qml b/src/mainview/components/ConversationSmartListContextMenu.qml index 32a7fb9c5..b29f42332 100644 --- a/src/mainview/components/ConversationSmartListContextMenu.qml +++ b/src/mainview/components/ConversationSmartListContextMenu.qml @@ -17,8 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 -import QtGraphicalEffects 1.14 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/FilesToSendContainer.qml b/src/mainview/components/FilesToSendContainer.qml index ec07935b7..523135f60 100644 --- a/src/mainview/components/FilesToSendContainer.qml +++ b/src/mainview/components/FilesToSendContainer.qml @@ -18,7 +18,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Layouts 1.14 import net.jami.Models 1.1 import net.jami.Constants 1.1 diff --git a/src/mainview/components/FilesToSendDelegate.qml b/src/mainview/components/FilesToSendDelegate.qml index b570f9b8e..5961c4472 100644 --- a/src/mainview/components/FilesToSendDelegate.qml +++ b/src/mainview/components/FilesToSendDelegate.qml @@ -17,7 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 diff --git a/src/mainview/components/InitialCallPage.qml b/src/mainview/components/InitialCallPage.qml index 207203573..86af172ba 100644 --- a/src/mainview/components/InitialCallPage.qml +++ b/src/mainview/components/InitialCallPage.qml @@ -20,8 +20,6 @@ import QtQuick 2.14 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.1 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/InvitationView.qml b/src/mainview/components/InvitationView.qml index f70564ca3..4ae4cf5d3 100644 --- a/src/mainview/components/InvitationView.qml +++ b/src/mainview/components/InvitationView.qml @@ -17,9 +17,7 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 import net.jami.Adapters 1.1 import net.jami.Constants 1.1 diff --git a/src/mainview/components/MainOverlay.qml b/src/mainview/components/MainOverlay.qml index 0df91af8c..24292fd5c 100644 --- a/src/mainview/components/MainOverlay.qml +++ b/src/mainview/components/MainOverlay.qml @@ -20,10 +20,7 @@ */ import QtQuick 2.14 -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.1 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/MessageBar.qml b/src/mainview/components/MessageBar.qml index 95fb868c9..50dd82f7f 100644 --- a/src/mainview/components/MessageBar.qml +++ b/src/mainview/components/MessageBar.qml @@ -17,7 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/MessageWebViewFooter.qml b/src/mainview/components/MessageWebViewFooter.qml index 254aa6d17..25a5c2feb 100644 --- a/src/mainview/components/MessageWebViewFooter.qml +++ b/src/mainview/components/MessageWebViewFooter.qml @@ -17,7 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import net.jami.Models 1.1 diff --git a/src/mainview/components/MessageWebViewHeader.qml b/src/mainview/components/MessageWebViewHeader.qml index 848d5885b..d1075dcc4 100644 --- a/src/mainview/components/MessageWebViewHeader.qml +++ b/src/mainview/components/MessageWebViewHeader.qml @@ -17,7 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import net.jami.Models 1.1 diff --git a/src/mainview/components/OngoingCallPage.qml b/src/mainview/components/OngoingCallPage.qml index 76712fc9a..a18ce7b78 100644 --- a/src/mainview/components/OngoingCallPage.qml +++ b/src/mainview/components/OngoingCallPage.qml @@ -21,7 +21,6 @@ import QtQuick 2.14 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.1 diff --git a/src/mainview/components/ParticipantCallInStatusDelegate.qml b/src/mainview/components/ParticipantCallInStatusDelegate.qml index d9065b0ae..e3c9c9ba8 100644 --- a/src/mainview/components/ParticipantCallInStatusDelegate.qml +++ b/src/mainview/components/ParticipantCallInStatusDelegate.qml @@ -17,7 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/ParticipantCallInStatusView.qml b/src/mainview/components/ParticipantCallInStatusView.qml index c75bb510c..9bf664bcd 100644 --- a/src/mainview/components/ParticipantCallInStatusView.qml +++ b/src/mainview/components/ParticipantCallInStatusView.qml @@ -18,7 +18,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Layouts 1.14 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/ParticipantControlLayout.qml b/src/mainview/components/ParticipantControlLayout.qml index 91612b006..53f8df372 100644 --- a/src/mainview/components/ParticipantControlLayout.qml +++ b/src/mainview/components/ParticipantControlLayout.qml @@ -16,7 +16,6 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.14 import QtQuick.Layouts 1.14 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/ParticipantOverlay.qml b/src/mainview/components/ParticipantOverlay.qml index 467d2e74b..3e6f7c5cc 100644 --- a/src/mainview/components/ParticipantOverlay.qml +++ b/src/mainview/components/ParticipantOverlay.qml @@ -18,11 +18,8 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 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.1 import net.jami.Models 1.1 diff --git a/src/mainview/components/ParticipantsLayer.qml b/src/mainview/components/ParticipantsLayer.qml index 993f1f7be..274388d4e 100644 --- a/src/mainview/components/ParticipantsLayer.qml +++ b/src/mainview/components/ParticipantsLayer.qml @@ -17,7 +17,6 @@ */ import QtQuick 2.14 -import QtQml 2.14 Item { id: root diff --git a/src/mainview/components/PluginHandlerItemDelegate.qml b/src/mainview/components/PluginHandlerItemDelegate.qml index 609082dba..184240fbb 100644 --- a/src/mainview/components/PluginHandlerItemDelegate.qml +++ b/src/mainview/components/PluginHandlerItemDelegate.qml @@ -18,9 +18,7 @@ import QtQuick 2.14 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.1 import net.jami.Constants 1.1 diff --git a/src/mainview/components/PluginHandlerPicker.qml b/src/mainview/components/PluginHandlerPicker.qml index 54497aeca..2afbf8f20 100644 --- a/src/mainview/components/PluginHandlerPicker.qml +++ b/src/mainview/components/PluginHandlerPicker.qml @@ -19,7 +19,6 @@ 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.1 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/ScreenRubberBand.qml b/src/mainview/components/ScreenRubberBand.qml index 970e2268c..c8ad76160 100644 --- a/src/mainview/components/ScreenRubberBand.qml +++ b/src/mainview/components/ScreenRubberBand.qml @@ -18,9 +18,6 @@ import QtQuick 2.14 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.1 import net.jami.Models 1.1 diff --git a/src/mainview/components/SelectScreen.qml b/src/mainview/components/SelectScreen.qml index 353b1a440..0d4017468 100644 --- a/src/mainview/components/SelectScreen.qml +++ b/src/mainview/components/SelectScreen.qml @@ -19,8 +19,6 @@ import QtQuick 2.14 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.1 import net.jami.Models 1.1 diff --git a/src/mainview/components/SidePanel.qml b/src/mainview/components/SidePanel.qml index 2a3981f06..a5f83ffdc 100644 --- a/src/mainview/components/SidePanel.qml +++ b/src/mainview/components/SidePanel.qml @@ -18,9 +18,7 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/SidePanelTabBar.qml b/src/mainview/components/SidePanelTabBar.qml index d3cdd7956..0bcd9a2f4 100644 --- a/src/mainview/components/SidePanelTabBar.qml +++ b/src/mainview/components/SidePanelTabBar.qml @@ -17,10 +17,7 @@ * 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 QtGraphicalEffects 1.14 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/mainview/components/SipInputPanel.qml b/src/mainview/components/SipInputPanel.qml index f4002c1dd..f6f5ec054 100644 --- a/src/mainview/components/SipInputPanel.qml +++ b/src/mainview/components/SipInputPanel.qml @@ -19,7 +19,6 @@ 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.1 import net.jami.Models 1.1 diff --git a/src/mainview/components/UserProfile.qml b/src/mainview/components/UserProfile.qml index eece2dbdc..8b4a046bc 100644 --- a/src/mainview/components/UserProfile.qml +++ b/src/mainview/components/UserProfile.qml @@ -18,7 +18,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import QtQuick.Layouts 1.14 import net.jami.Constants 1.1 diff --git a/src/mainview/components/WelcomePageQrDialog.qml b/src/mainview/components/WelcomePageQrDialog.qml index 418588af9..a6dd9fe7a 100644 --- a/src/mainview/components/WelcomePageQrDialog.qml +++ b/src/mainview/components/WelcomePageQrDialog.qml @@ -17,10 +17,7 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 -import QtQuick.Layouts 1.14 -import net.jami.Models 1.1 import net.jami.Adapters 1.1 import "../../commoncomponents" diff --git a/src/settingsview/SettingsView.qml b/src/settingsview/SettingsView.qml index 0ce355b93..9dee8e522 100644 --- a/src/settingsview/SettingsView.qml +++ b/src/settingsview/SettingsView.qml @@ -19,9 +19,7 @@ import QtQuick 2.14 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.1 import net.jami.Adapters 1.1 @@ -30,7 +28,6 @@ import net.jami.Constants 1.1 import "components" import "../mainview/js/contactpickercreation.js" as ContactPickerCreation - Rectangle { id: root diff --git a/src/settingsview/components/AccountProfile.qml b/src/settingsview/components/AccountProfile.qml index 733910fd9..80be5d37a 100644 --- a/src/settingsview/components/AccountProfile.qml +++ b/src/settingsview/components/AccountProfile.qml @@ -18,10 +18,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/AdvancedCallSettings.qml b/src/settingsview/components/AdvancedCallSettings.qml index 3d1a2a547..984a669fc 100644 --- a/src/settingsview/components/AdvancedCallSettings.qml +++ b/src/settingsview/components/AdvancedCallSettings.qml @@ -19,10 +19,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/AdvancedChatSettings.qml b/src/settingsview/components/AdvancedChatSettings.qml index 55d053de4..cebee5259 100644 --- a/src/settingsview/components/AdvancedChatSettings.qml +++ b/src/settingsview/components/AdvancedChatSettings.qml @@ -18,7 +18,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 import net.jami.Adapters 1.1 import net.jami.Constants 1.1 diff --git a/src/settingsview/components/AdvancedConnectivitySettings.qml b/src/settingsview/components/AdvancedConnectivitySettings.qml index 09375c910..171af99e1 100644 --- a/src/settingsview/components/AdvancedConnectivitySettings.qml +++ b/src/settingsview/components/AdvancedConnectivitySettings.qml @@ -18,10 +18,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/AdvancedJamiSecuritySettings.qml b/src/settingsview/components/AdvancedJamiSecuritySettings.qml index 6e0e9f693..a132fa024 100644 --- a/src/settingsview/components/AdvancedJamiSecuritySettings.qml +++ b/src/settingsview/components/AdvancedJamiSecuritySettings.qml @@ -18,10 +18,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/AdvancedMediaSettings.qml b/src/settingsview/components/AdvancedMediaSettings.qml index aa76c276e..13cd64745 100644 --- a/src/settingsview/components/AdvancedMediaSettings.qml +++ b/src/settingsview/components/AdvancedMediaSettings.qml @@ -19,9 +19,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/AdvancedNameServerSettings.qml b/src/settingsview/components/AdvancedNameServerSettings.qml index da9d69e4d..157c10e85 100644 --- a/src/settingsview/components/AdvancedNameServerSettings.qml +++ b/src/settingsview/components/AdvancedNameServerSettings.qml @@ -18,10 +18,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/AdvancedOpenDHTSettings.qml b/src/settingsview/components/AdvancedOpenDHTSettings.qml index bf2a50dca..6303dcbd8 100644 --- a/src/settingsview/components/AdvancedOpenDHTSettings.qml +++ b/src/settingsview/components/AdvancedOpenDHTSettings.qml @@ -18,10 +18,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/AdvancedPublicAddressSettings.qml b/src/settingsview/components/AdvancedPublicAddressSettings.qml index 6deb85f84..8b5df63f1 100644 --- a/src/settingsview/components/AdvancedPublicAddressSettings.qml +++ b/src/settingsview/components/AdvancedPublicAddressSettings.qml @@ -18,10 +18,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/AdvancedSDPSettings.qml b/src/settingsview/components/AdvancedSDPSettings.qml index 02f0329f2..b66067006 100644 --- a/src/settingsview/components/AdvancedSDPSettings.qml +++ b/src/settingsview/components/AdvancedSDPSettings.qml @@ -17,12 +17,7 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 -import QtQuick.Dialogs 1.3 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/AdvancedSIPSecuritySettings.qml b/src/settingsview/components/AdvancedSIPSecuritySettings.qml index 76453a3e9..8e836facc 100644 --- a/src/settingsview/components/AdvancedSIPSecuritySettings.qml +++ b/src/settingsview/components/AdvancedSIPSecuritySettings.qml @@ -19,9 +19,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/AdvancedSettings.qml b/src/settingsview/components/AdvancedSettings.qml index 9483df753..f2a73be08 100644 --- a/src/settingsview/components/AdvancedSettings.qml +++ b/src/settingsview/components/AdvancedSettings.qml @@ -18,10 +18,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/AdvancedVoiceMailSettings.qml b/src/settingsview/components/AdvancedVoiceMailSettings.qml index 34fad1d9c..3f49473da 100644 --- a/src/settingsview/components/AdvancedVoiceMailSettings.qml +++ b/src/settingsview/components/AdvancedVoiceMailSettings.qml @@ -19,9 +19,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/AvSettingPage.qml b/src/settingsview/components/AvSettingPage.qml index 0382b8678..23343bee1 100644 --- a/src/settingsview/components/AvSettingPage.qml +++ b/src/settingsview/components/AvSettingPage.qml @@ -17,10 +17,7 @@ */ import QtQuick 2.14 -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.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/BannedContacts.qml b/src/settingsview/components/BannedContacts.qml index 2cd83196c..36cb7a114 100644 --- a/src/settingsview/components/BannedContacts.qml +++ b/src/settingsview/components/BannedContacts.qml @@ -17,11 +17,7 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/ChatviewSettings.qml b/src/settingsview/components/ChatviewSettings.qml index d580f4e25..ac9834135 100644 --- a/src/settingsview/components/ChatviewSettings.qml +++ b/src/settingsview/components/ChatviewSettings.qml @@ -18,10 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 @@ -49,6 +46,7 @@ ColumnLayout { ToggleSwitch { id: enableTypingIndicatorCheckbox + Layout.fillWidth: true Layout.leftMargin: JamiTheme.preferredMarginSize @@ -64,6 +62,7 @@ ColumnLayout { ToggleSwitch { id: displayImagesCheckbox + Layout.fillWidth: true Layout.leftMargin: JamiTheme.preferredMarginSize diff --git a/src/settingsview/components/ContactItemDelegate.qml b/src/settingsview/components/ContactItemDelegate.qml index a7a1621b9..b3d2746a3 100644 --- a/src/settingsview/components/ContactItemDelegate.qml +++ b/src/settingsview/components/ContactItemDelegate.qml @@ -19,9 +19,7 @@ import QtQuick 2.14 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.1 import net.jami.Constants 1.1 diff --git a/src/settingsview/components/CurrentAccountSettings.qml b/src/settingsview/components/CurrentAccountSettings.qml index 35ddd4c33..e6361cedc 100644 --- a/src/settingsview/components/CurrentAccountSettings.qml +++ b/src/settingsview/components/CurrentAccountSettings.qml @@ -18,10 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 -import QtQuick.Dialogs 1.3 import Qt.labs.platform 1.1 import net.jami.Models 1.1 diff --git a/src/settingsview/components/DeviceItemDelegate.qml b/src/settingsview/components/DeviceItemDelegate.qml index 49c9bdc3d..19c69a7dc 100644 --- a/src/settingsview/components/DeviceItemDelegate.qml +++ b/src/settingsview/components/DeviceItemDelegate.qml @@ -18,7 +18,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 diff --git a/src/settingsview/components/GeneralSettingsPage.qml b/src/settingsview/components/GeneralSettingsPage.qml index d019dc564..22b5c5565 100644 --- a/src/settingsview/components/GeneralSettingsPage.qml +++ b/src/settingsview/components/GeneralSettingsPage.qml @@ -17,11 +17,7 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 -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.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/JamiUserIdentity.qml b/src/settingsview/components/JamiUserIdentity.qml index 4d85b36f5..0a4b8d89b 100644 --- a/src/settingsview/components/JamiUserIdentity.qml +++ b/src/settingsview/components/JamiUserIdentity.qml @@ -19,9 +19,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/KeyBoardShortcutKey.qml b/src/settingsview/components/KeyBoardShortcutKey.qml index 93dc2b9fa..4429dcd55 100644 --- a/src/settingsview/components/KeyBoardShortcutKey.qml +++ b/src/settingsview/components/KeyBoardShortcutKey.qml @@ -17,7 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Controls 2.14 import net.jami.Constants 1.1 diff --git a/src/settingsview/components/LinkedDevices.qml b/src/settingsview/components/LinkedDevices.qml index ba92a3ac3..57c0d8857 100644 --- a/src/settingsview/components/LinkedDevices.qml +++ b/src/settingsview/components/LinkedDevices.qml @@ -18,11 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtQuick.Dialogs 1.3 import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/LogsView.qml b/src/settingsview/components/LogsView.qml index c9b608f24..e4b1d29da 100644 --- a/src/settingsview/components/LogsView.qml +++ b/src/settingsview/components/LogsView.qml @@ -18,9 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 -import Qt.labs.platform 1.1 import QtQuick.Dialogs 1.2 import net.jami.Models 1.1 diff --git a/src/settingsview/components/MediaCodecDelegate.qml b/src/settingsview/components/MediaCodecDelegate.qml index a74b6ffda..e50760ef1 100644 --- a/src/settingsview/components/MediaCodecDelegate.qml +++ b/src/settingsview/components/MediaCodecDelegate.qml @@ -18,7 +18,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 diff --git a/src/settingsview/components/MediaSettings.qml b/src/settingsview/components/MediaSettings.qml index 74e87df67..1d208bafa 100644 --- a/src/settingsview/components/MediaSettings.qml +++ b/src/settingsview/components/MediaSettings.qml @@ -19,9 +19,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/PluginItemDelegate.qml b/src/settingsview/components/PluginItemDelegate.qml index 8b8aa7335..5fed7592d 100644 --- a/src/settingsview/components/PluginItemDelegate.qml +++ b/src/settingsview/components/PluginItemDelegate.qml @@ -18,9 +18,7 @@ import QtQuick 2.14 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.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/PluginListPreferencesView.qml b/src/settingsview/components/PluginListPreferencesView.qml index 6a9abacf4..3f75c6372 100644 --- a/src/settingsview/components/PluginListPreferencesView.qml +++ b/src/settingsview/components/PluginListPreferencesView.qml @@ -18,11 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 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.1 import net.jami.Models 1.1 diff --git a/src/settingsview/components/PluginListSettingsView.qml b/src/settingsview/components/PluginListSettingsView.qml index ea80fe2f5..01fac5d90 100644 --- a/src/settingsview/components/PluginListSettingsView.qml +++ b/src/settingsview/components/PluginListSettingsView.qml @@ -18,10 +18,8 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -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.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/PluginSettingsPage.qml b/src/settingsview/components/PluginSettingsPage.qml index 31c29636d..061b4deaf 100644 --- a/src/settingsview/components/PluginSettingsPage.qml +++ b/src/settingsview/components/PluginSettingsPage.qml @@ -18,10 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -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.1 import net.jami.Models 1.1 diff --git a/src/settingsview/components/RecordingSettings.qml b/src/settingsview/components/RecordingSettings.qml index 62575ed90..a88abaf75 100644 --- a/src/settingsview/components/RecordingSettings.qml +++ b/src/settingsview/components/RecordingSettings.qml @@ -18,9 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 import Qt.labs.platform 1.1 import net.jami.Models 1.1 diff --git a/src/settingsview/components/SIPUserIdentity.qml b/src/settingsview/components/SIPUserIdentity.qml index 1c3dbad2d..97d2d25bf 100644 --- a/src/settingsview/components/SIPUserIdentity.qml +++ b/src/settingsview/components/SIPUserIdentity.qml @@ -18,10 +18,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/SettingMaterialButton.qml b/src/settingsview/components/SettingMaterialButton.qml index 8dc5ec24e..fdaa18af9 100644 --- a/src/settingsview/components/SettingMaterialButton.qml +++ b/src/settingsview/components/SettingMaterialButton.qml @@ -18,10 +18,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/SettingSpinBox.qml b/src/settingsview/components/SettingSpinBox.qml index 887847de3..06936fa11 100644 --- a/src/settingsview/components/SettingSpinBox.qml +++ b/src/settingsview/components/SettingSpinBox.qml @@ -19,9 +19,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/SettingsComboBox.qml b/src/settingsview/components/SettingsComboBox.qml index f62a6ff4b..dcf49010d 100644 --- a/src/settingsview/components/SettingsComboBox.qml +++ b/src/settingsview/components/SettingsComboBox.qml @@ -17,11 +17,7 @@ */ import QtQuick 2.14 -import QtQuick.Window 2.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 import net.jami.Constants 1.1 diff --git a/src/settingsview/components/SettingsHeader.qml b/src/settingsview/components/SettingsHeader.qml index 591412f3d..85b4838a0 100644 --- a/src/settingsview/components/SettingsHeader.qml +++ b/src/settingsview/components/SettingsHeader.qml @@ -18,9 +18,7 @@ import QtQuick 2.14 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.1 import net.jami.Constants 1.1 diff --git a/src/settingsview/components/SettingsMaterialLineEdit.qml b/src/settingsview/components/SettingsMaterialLineEdit.qml index 8601a7866..8b029789f 100644 --- a/src/settingsview/components/SettingsMaterialLineEdit.qml +++ b/src/settingsview/components/SettingsMaterialLineEdit.qml @@ -18,10 +18,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/SettingsMenu.qml b/src/settingsview/components/SettingsMenu.qml index 0d4e3d481..dacbd9c93 100644 --- a/src/settingsview/components/SettingsMenu.qml +++ b/src/settingsview/components/SettingsMenu.qml @@ -18,7 +18,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Layouts 1.14 import net.jami.Models 1.1 import net.jami.Constants 1.1 diff --git a/src/settingsview/components/SystemSettings.qml b/src/settingsview/components/SystemSettings.qml index 9fdc70b5c..000be2c9a 100644 --- a/src/settingsview/components/SystemSettings.qml +++ b/src/settingsview/components/SystemSettings.qml @@ -18,9 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 import Qt.labs.platform 1.1 import net.jami.Models 1.1 diff --git a/src/settingsview/components/ToggleSwitch.qml b/src/settingsview/components/ToggleSwitch.qml index 02eb7d53a..986fc23ba 100644 --- a/src/settingsview/components/ToggleSwitch.qml +++ b/src/settingsview/components/ToggleSwitch.qml @@ -18,9 +18,7 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 -import QtGraphicalEffects 1.14 import net.jami.Constants 1.1 diff --git a/src/settingsview/components/TroubleshootSettings.qml b/src/settingsview/components/TroubleshootSettings.qml index 8b7ebbefb..dd0efb453 100644 --- a/src/settingsview/components/TroubleshootSettings.qml +++ b/src/settingsview/components/TroubleshootSettings.qml @@ -18,7 +18,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import net.jami.Models 1.1 diff --git a/src/settingsview/components/UpdateSettings.qml b/src/settingsview/components/UpdateSettings.qml index c7c85315b..0dbf3cd25 100644 --- a/src/settingsview/components/UpdateSettings.qml +++ b/src/settingsview/components/UpdateSettings.qml @@ -19,7 +19,6 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/UserIdentity.qml b/src/settingsview/components/UserIdentity.qml index 16f808745..fc31f9ffe 100644 --- a/src/settingsview/components/UserIdentity.qml +++ b/src/settingsview/components/UserIdentity.qml @@ -18,10 +18,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 -import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/settingsview/components/VideoSettings.qml b/src/settingsview/components/VideoSettings.qml index 155a471da..752f61e41 100644 --- a/src/settingsview/components/VideoSettings.qml +++ b/src/settingsview/components/VideoSettings.qml @@ -18,10 +18,8 @@ import QtQuick 2.14 import QtQuick.Controls 2.14 -import QtQuick.Controls.Universal 2.14 import QtQuick.Layouts 1.14 import QtGraphicalEffects 1.14 -import Qt.labs.platform 1.1 import net.jami.Models 1.1 import net.jami.Adapters 1.1 diff --git a/src/wizardview/WizardView.qml b/src/wizardview/WizardView.qml index bb934c838..b4b598867 100644 --- a/src/wizardview/WizardView.qml +++ b/src/wizardview/WizardView.qml @@ -19,9 +19,7 @@ import QtQuick 2.14 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.1 import net.jami.Adapters 1.1 diff --git a/src/wizardview/components/AccountCreationStepIndicator.qml b/src/wizardview/components/AccountCreationStepIndicator.qml index 9d235cdf0..d1c733d5c 100644 --- a/src/wizardview/components/AccountCreationStepIndicator.qml +++ b/src/wizardview/components/AccountCreationStepIndicator.qml @@ -17,8 +17,6 @@ */ import QtQuick 2.14 -import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 import net.jami.Constants 1.1 diff --git a/src/wizardview/components/CreateAccountPage.qml b/src/wizardview/components/CreateAccountPage.qml index 67c310683..ec770e14e 100644 --- a/src/wizardview/components/CreateAccountPage.qml +++ b/src/wizardview/components/CreateAccountPage.qml @@ -20,7 +20,6 @@ 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.1 import net.jami.Adapters 1.1 diff --git a/src/wizardview/components/WelcomePage.qml b/src/wizardview/components/WelcomePage.qml index 849ee2b01..9f6b63eeb 100644 --- a/src/wizardview/components/WelcomePage.qml +++ b/src/wizardview/components/WelcomePage.qml @@ -20,8 +20,6 @@ import QtQuick 2.14 import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 -import QtGraphicalEffects 1.14 import net.jami.Models 1.1 import net.jami.Adapters 1.1 -- GitLab