Move usersettings page to pages subdir

resources/qml/Root.qml

@@ -7,6 +7,7 @@ import "./delegates"
 import "./device-verification"
 import "./dialogs"
 import "./emoji"
+import "./pages"
 import "./voip"
 import Qt.labs.platform 1.1 as Platform
 import QtQuick 2.15

resources/qml/UserSettingsPage.qml → resources/qml/pages/UserSettingsPage.qml

@@ -3,7 +3,8 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-import "ui"
+import ".."
+import "../ui"
 import Qt.labs.platform 1.1 as Platform
 import QtQuick 2.15
 import QtQuick.Controls 2.15

resources/res.qrc

@@ -86,7 +86,6 @@
         <file>qml/CommunitiesList.qml</file>
         <file>qml/RoomList.qml</file>
         <file>qml/TimelineView.qml</file>
-        <file>qml/UserSettingsPage.qml</file>
         <file>qml/Avatar.qml</file>
         <file>qml/Completer.qml</file>
         <file>qml/EncryptionIndicator.qml</file>
@@ -110,6 +109,7 @@
         <file>qml/SelfVerificationCheck.qml</file>
         <file>qml/TypingIndicator.qml</file>
         <file>qml/NotificationWarning.qml</file>
+        <file>qml/pages/UserSettingsPage.qml</file>
         <file>qml/components/AdaptiveLayout.qml</file>
         <file>qml/components/AdaptiveLayoutElement.qml</file>
         <file>qml/components/AvatarListTile.qml</file>