From b62314319052d5f434c0d0b0bb93eefe30d81c58 Mon Sep 17 00:00:00 2001 From: askmeaboutloom Date: Sat, 31 Aug 2024 12:32:40 +0200 Subject: [PATCH] Fix streamed session resets not starting in Qt5 By registering net::Message with the Qt meta type system, since otherwise it doesn't want to set up a queued signal with a message list. --- src/libclient/document.cpp | 3 ++- src/libshared/net/message.h | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libclient/document.cpp b/src/libclient/document.cpp index afc72df5fd..00634fa7cd 100644 --- a/src/libclient/document.cpp +++ b/src/libclient/document.cpp @@ -1223,7 +1223,8 @@ net::MessageList Document::generateStreamSnapshot( } void Document::startSendingStreamResetSnapshot( - const net::MessageList &image, int messageCount, const QString &correlator) + const QVector &image, int messageCount, + const QString &correlator) { if(m_streamResetState == StreamResetState::Generating && m_autoResetCorrelator == correlator) { diff --git a/src/libshared/net/message.h b/src/libshared/net/message.h index c401a9a505..c8da5e678f 100644 --- a/src/libshared/net/message.h +++ b/src/libshared/net/message.h @@ -4,6 +4,7 @@ extern "C" { #include } +#include #include class QByteArray; @@ -131,4 +132,6 @@ makeTrustedUsersMessage(uint8_t contextId, const QVector &users); } +Q_DECLARE_METATYPE(net::Message) + #endif