From d8e97e1c068abdaad98a22367eebea4778d9590a Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Sun, 15 Dec 2019 15:27:46 +0100
Subject: [PATCH] Move kaidan_qml.qrc into src/qml/ to simply paths

Closes #285.
---
 CMakeLists.txt  |  4 ++--
 kaidan_qml.qrc  | 51 -----------------------------------------------
 src/qml/qml.qrc | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 53 deletions(-)
 delete mode 100644 kaidan_qml.qrc
 create mode 100644 src/qml/qml.qrc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b917cd97..331677e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,9 +143,9 @@ elseif(WIN32)
 endif()
 
 if(QUICK_COMPILER)
-	qtquick_compiler_add_resources(KAIDAN_QML_QRC kaidan_qml.qrc)
+	qtquick_compiler_add_resources(KAIDAN_QML_QRC src/qml/qml.qrc)
 else()
-	qt5_add_resources(KAIDAN_QML_QRC kaidan_qml.qrc)
+	qt5_add_resources(KAIDAN_QML_QRC src/qml/qml.qrc)
 endif()
 
 add_executable(${PROJECT_NAME}
diff --git a/kaidan_qml.qrc b/kaidan_qml.qrc
deleted file mode 100644
index 2d48f321..00000000
--- a/kaidan_qml.qrc
+++ /dev/null
@@ -1,51 +0,0 @@
-<RCC>
-	<qresource prefix="/">
-		<file alias="qml/main.qml">src/qml/main.qml</file>
-		<file alias="qml/RosterPage.qml">src/qml/RosterPage.qml</file>
-		<file alias="qml/LoginPage.qml">src/qml/LoginPage.qml</file>
-		<file alias="qml/ChatPage.qml">src/qml/ChatPage.qml</file>
-		<file alias="qml/AboutDialog.qml">src/qml/AboutDialog.qml</file>
-		<file alias="qml/GlobalDrawer.qml">src/qml/GlobalDrawer.qml</file>
-		<file alias="qml/EmptyChatPage.qml">src/qml/EmptyChatPage.qml</file>
-		<file alias="qml/QrCodeScannerPage.qml">src/qml/QrCodeScannerPage.qml</file>
-		<file alias="qml/UserProfilePage.qml">src/qml/UserProfilePage.qml</file>
-		<file alias="qml/MultimediaSettingsPage.qml">src/qml/MultimediaSettingsPage.qml</file>
-
-		<file alias="qml/elements/SubRequestAcceptSheet.qml">src/qml/elements/SubRequestAcceptSheet.qml</file>
-		<file alias="qml/elements/RosterAddContactSheet.qml">src/qml/elements/RosterAddContactSheet.qml</file>
-		<file alias="qml/elements/RosterRenameContactSheet.qml">src/qml/elements/RosterRenameContactSheet.qml</file>
-		<file alias="qml/elements/RosterRemoveContactSheet.qml">src/qml/elements/RosterRemoveContactSheet.qml</file>
-		<file alias="qml/elements/RosterListItem.qml">src/qml/elements/RosterListItem.qml</file>
-		<file alias="qml/elements/MessageCounter.qml">src/qml/elements/MessageCounter.qml</file>
-		<file alias="qml/elements/ChatMessage.qml">src/qml/elements/ChatMessage.qml</file>
-		<file alias="qml/elements/RoundImage.qml">src/qml/elements/RoundImage.qml</file>
-		<file alias="qml/elements/IconButton.qml">src/qml/elements/IconButton.qml</file>
-		<file alias="qml/elements/FileChooser.qml">src/qml/elements/FileChooser.qml</file>
-		<file alias="qml/elements/FileChooserDesktop.qml">src/qml/elements/FileChooserDesktop.qml</file>
-		<file alias="qml/elements/FileChooserMobile.qml">src/qml/elements/FileChooserMobile.qml</file>
-		<file alias="qml/elements/SendMediaSheet.qml">src/qml/elements/SendMediaSheet.qml</file>
-
-		<file alias="qml/elements/MediaPreview.qml">src/qml/elements/MediaPreview.qml</file>
-		<file alias="qml/elements/MediaPreviewImage.qml">src/qml/elements/MediaPreviewImage.qml</file>
-		<file alias="qml/elements/MediaPreviewAudio.qml">src/qml/elements/MediaPreviewAudio.qml</file>
-		<file alias="qml/elements/MediaPreviewVideo.qml">src/qml/elements/MediaPreviewVideo.qml</file>
-		<file alias="qml/elements/MediaPreviewOther.qml">src/qml/elements/MediaPreviewOther.qml</file>
-		<file alias="qml/elements/MediaPreviewLocation.qml">src/qml/elements/MediaPreviewLocation.qml</file>
-		<file alias="qml/elements/MediaPreviewLoader.qml">src/qml/elements/MediaPreviewLoader.qml</file>
-
-		<file alias="qml/elements/NewMedia.qml">src/qml/elements/NewMedia.qml</file>
-		<file alias="qml/elements/NewMediaLocation.qml">src/qml/elements/NewMediaLocation.qml</file>
-		<file alias="qml/elements/NewMediaLoader.qml">src/qml/elements/NewMediaLoader.qml</file>
-
-		<file alias="qml/elements/EmojiPicker.qml">src/qml/elements/EmojiPicker.qml</file>
-		<file alias="qml/elements/TextAvatar.qml">src/qml/elements/TextAvatar.qml</file>
-		<file alias="qml/elements/Avatar.qml">src/qml/elements/Avatar.qml</file>
-
-		<file alias="qml/settings/SettingsItem.qml">src/qml/settings/SettingsItem.qml</file>
-		<file alias="qml/settings/SettingsPage.qml">src/qml/settings/SettingsPage.qml</file>
-		<file alias="qml/settings/SettingsSheet.qml">src/qml/settings/SettingsSheet.qml</file>
-		<file alias="qml/settings/ChangePassword.qml">src/qml/settings/ChangePassword.qml</file>
-
-		<file alias="qtquickcontrols2.conf">misc/qtquickcontrols2.conf</file>
-	</qresource>
-</RCC>
diff --git a/src/qml/qml.qrc b/src/qml/qml.qrc
new file mode 100644
index 00000000..6eb8dcec
--- /dev/null
+++ b/src/qml/qml.qrc
@@ -0,0 +1,53 @@
+<RCC>
+	<qresource prefix="/qml/">
+		<file>main.qml</file>
+		<file>RosterPage.qml</file>
+		<file>LoginPage.qml</file>
+		<file>ChatPage.qml</file>
+		<file>AboutDialog.qml</file>
+		<file>GlobalDrawer.qml</file>
+		<file>EmptyChatPage.qml</file>
+		<file>QrCodeScannerPage.qml</file>
+		<file>UserProfilePage.qml</file>
+		<file>MultimediaSettingsPage.qml</file>
+
+		<file>elements/SubRequestAcceptSheet.qml</file>
+		<file>elements/RosterAddContactSheet.qml</file>
+		<file>elements/RosterRenameContactSheet.qml</file>
+		<file>elements/RosterRemoveContactSheet.qml</file>
+		<file>elements/RosterListItem.qml</file>
+		<file>elements/MessageCounter.qml</file>
+		<file>elements/ChatMessage.qml</file>
+		<file>elements/RoundImage.qml</file>
+		<file>elements/IconButton.qml</file>
+		<file>elements/FileChooser.qml</file>
+		<file>elements/FileChooserDesktop.qml</file>
+		<file>elements/FileChooserMobile.qml</file>
+		<file>elements/SendMediaSheet.qml</file>
+
+		<file>elements/MediaPreview.qml</file>
+		<file>elements/MediaPreviewImage.qml</file>
+		<file>elements/MediaPreviewAudio.qml</file>
+		<file>elements/MediaPreviewVideo.qml</file>
+		<file>elements/MediaPreviewOther.qml</file>
+		<file>elements/MediaPreviewLocation.qml</file>
+		<file>elements/MediaPreviewLoader.qml</file>
+
+		<file>elements/NewMedia.qml</file>
+		<file>elements/NewMediaLocation.qml</file>
+		<file>elements/NewMediaLoader.qml</file>
+
+		<file>elements/EmojiPicker.qml</file>
+		<file>elements/TextAvatar.qml</file>
+		<file>elements/Avatar.qml</file>
+
+		<file>settings/SettingsItem.qml</file>
+		<file>settings/SettingsPage.qml</file>
+		<file>settings/SettingsSheet.qml</file>
+		<file>settings/ChangePassword.qml</file>
+	</qresource>
+
+	<qresource prefix="/">
+		<file alias="qtquickcontrols2.conf">../../misc/qtquickcontrols2.conf</file>
+	</qresource>
+</RCC>
-- 
GitLab