From a43990559b9cd60a3349bc8ac0c569dd53d1ad4b Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Tue, 29 Aug 2023 23:16:27 +0200 Subject: [PATCH] Rename source property of MessageDelegateContextMenu Starting with Qt6.6, this collides with a FINAL property of Loader and thus doesn't run --- src/qml/Component/Timeline/TimelineContainer.qml | 2 +- src/qml/Menu/Timeline/FileDelegateContextMenu.qml | 2 +- src/qml/Menu/Timeline/MessageDelegateContextMenu.qml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qml/Component/Timeline/TimelineContainer.qml b/src/qml/Component/Timeline/TimelineContainer.qml index 394c23429..5f5eb12e2 100644 --- a/src/qml/Component/Timeline/TimelineContainer.qml +++ b/src/qml/Component/Timeline/TimelineContainer.qml @@ -622,7 +622,7 @@ ColumnLayout { selectedText: selectedText, author: root.author, eventId: root.eventId, - source: root.jsonSource, + eventSource: root.jsonSource, eventType: root.delegateType, plainText: root.plainText, htmlText: root.display, diff --git a/src/qml/Menu/Timeline/FileDelegateContextMenu.qml b/src/qml/Menu/Timeline/FileDelegateContextMenu.qml index d7f30630d..f2570719a 100644 --- a/src/qml/Menu/Timeline/FileDelegateContextMenu.qml +++ b/src/qml/Menu/Timeline/FileDelegateContextMenu.qml @@ -92,7 +92,7 @@ MessageDelegateContextMenu { icon.name: "code-context" onTriggered: { applicationWindow().pageStack.pushDialogLayer('qrc:/MessageSourceSheet.qml', { - sourceText: root.source + sourceText: root.eventSource }, { title: i18n("Message Source"), width: Kirigami.Units.gridUnit * 25 diff --git a/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml b/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml index 4c9842574..f01a725bb 100644 --- a/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml +++ b/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml @@ -16,7 +16,7 @@ Loader { required property var author required property string eventId property var eventType - required property string source + required property string eventSource property string selectedText: "" required property string plainText property string htmlText: undefined @@ -85,7 +85,7 @@ Loader { icon.name: "code-context" onTriggered: { applicationWindow().pageStack.pushDialogLayer('qrc:/MessageSourceSheet.qml', { - sourceText: root.source + sourceText: root.eventSource }, { title: i18n("Message Source"), width: Kirigami.Units.gridUnit * 25