diff options
author | kamathmanu <manuriddle@gmail.com> | 2021-08-07 21:20:43 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-07 21:20:43 +0000 |
commit | 2dfccda73c44d97e9e3e52db3e03315e8ef656a5 (patch) | |
tree | 52c9855610cbdf6f6284cfacbaba07f676a0f621 /resources/res.qrc | |
parent | Fix Duplicate fetched chunk (diff) | |
parent | Show encryption errors in qml and add request keys button (diff) | |
download | nheko-2dfccda73c44d97e9e3e52db3e03315e8ef656a5.tar.xz |
Merge branch 'master' into nhekoRoomDirectory
Diffstat (limited to 'resources/res.qrc')
-rw-r--r-- | resources/res.qrc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/resources/res.qrc b/resources/res.qrc index 407a0a98..3e417d4c 100644 --- a/resources/res.qrc +++ b/resources/res.qrc @@ -112,7 +112,6 @@ </qresource> <qresource prefix="/"> <file>qtquickcontrols2.conf</file> - <file>qml/Root.qml</file> <file>qml/ChatPage.qml</file> <file>qml/CommunitiesList.qml</file> @@ -144,15 +143,21 @@ <file>qml/emoji/StickerPicker.qml</file> <file>qml/UserProfile.qml</file> <file>qml/RoomDirectory.qml</file> - <file>qml/delegates/MessageDelegate.qml</file> + <file>qml/delegates/MessageDelegate.qml</file> <file>qml/delegates/TextMessage.qml</file> <file>qml/delegates/NoticeMessage.qml</file> <file>qml/delegates/ImageMessage.qml</file> <file>qml/delegates/PlayableMediaMessage.qml</file> + <file>qml/delegates/MessageDelegate.qml</file> + <file>qml/delegates/Encrypted.qml</file> <file>qml/delegates/FileMessage.qml</file> + <file>qml/delegates/ImageMessage.qml</file> + <file>qml/delegates/NoticeMessage.qml</file> <file>qml/delegates/Pill.qml</file> <file>qml/delegates/Placeholder.qml</file> + <file>qml/delegates/PlayableMediaMessage.qml</file> <file>qml/delegates/Reply.qml</file> + <file>qml/delegates/TextMessage.qml</file> <file>qml/device-verification/Waiting.qml</file> <file>qml/device-verification/DeviceVerification.qml</file> <file>qml/device-verification/DigitVerification.qml</file> @@ -162,6 +167,7 @@ <file>qml/device-verification/Success.qml</file> <file>qml/dialogs/InputDialog.qml</file> <file>qml/dialogs/ImagePackSettingsDialog.qml</file> + <file>qml/dialogs/ImagePackEditorDialog.qml</file> <file>qml/ui/Ripple.qml</file> <file>qml/ui/Spinner.qml</file> <file>qml/ui/animations/BlinkAnimation.qml</file> @@ -175,9 +181,12 @@ <file>qml/voip/VideoCall.qml</file> <file>qml/components/AdaptiveLayout.qml</file> <file>qml/components/AdaptiveLayoutElement.qml</file> + <file>qml/components/AvatarListTile.qml</file> <file>qml/components/FlatButton.qml</file> <file>qml/RoomMembers.qml</file> <file>qml/InviteDialog.qml</file> + <file>qml/ReadReceipts.qml</file> + <file>qml/RawMessageDialog.qml</file> </qresource> <qresource prefix="/media"> <file>media/ring.ogg</file> |