Merge remote-tracking branch 'nheko-im/master' into video_player_enhancements

2 files changed, 4 insertions, 3 deletions

diff --git a/resources/qml/dialogs/LogoutDialog.qml b/resources/qml/dialogs/LogoutDialog.qml

index c571a89e..6098a289 100644
--- a/resources/qml/dialogs/LogoutDialog.qml
+++ b/resources/qml/dialogs/LogoutDialog.qml
@@ -2,18 +2,18 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-import Qt.labs.platform 1.1
+import Qt.labs.platform 1.1 as P
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import im.nheko 1.0
 
-MessageDialog {
+P.MessageDialog {
     id: logoutRoot
 
     title: qsTr("Log out")
     text: CallManager.isOnCall ? qsTr("A call is in progress. Log out?") : qsTr("Are you sure you want to log out?")
     modality: Qt.WindowModal
     flags: Qt.Tool | Qt.WindowStaysOnTopHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
-    buttons: MessageDialog.Ok | MessageDialog.Cancel
+    buttons: P.MessageDialog.Ok | P.MessageDialog.Cancel
     onAccepted: Nheko.logout()
 }
diff --git a/resources/qml/dialogs/ReadReceipts.qml b/resources/qml/dialogs/ReadReceipts.qml

index 2e2b5486..f551bae9 100644
--- a/resources/qml/dialogs/ReadReceipts.qml
+++ b/resources/qml/dialogs/ReadReceipts.qml
@@ -81,6 +81,7 @@ ApplicationWindow {
                             userid: model.mxid
                             url: model.avatarUrl.replace("mxc://", "image://MxcImage/")
                             displayName: model.displayName
+                            enabled: false
                         }
 
                         ColumnLayout {