From 67ea5b45701e6bd5bf244039dc60a134d67a4cab Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sun, 13 Jun 2021 14:08:52 +0200
Subject: Disable the piece depending on Qt Multimedia for Qt 6

Waiting for the Multimedia arrival in Qt 6.2.
---
 lib/events/roommessageevent.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib/events')

diff --git a/lib/events/roommessageevent.cpp b/lib/events/roommessageevent.cpp
index 31c0fd9e..3f6e475d 100644
--- a/lib/events/roommessageevent.cpp
+++ b/lib/events/roommessageevent.cpp
@@ -10,7 +10,9 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QMimeDatabase>
 #include <QtGui/QImageReader>
-#include <QtMultimedia/QMediaResource>
+#if QT_VERSION_MAJOR < 6
+#    include <QtMultimedia/QMediaResource>
+#endif
 
 using namespace Quotient;
 using namespace EventContent;
@@ -149,7 +151,11 @@ TypedBase* contentFromFile(const QFileInfo& file, bool asGenericFile)
         // done by starting to play the file. Left for a future implementation.
         if (mimeTypeName.startsWith("video/"))
             return new VideoContent(localUrl, file.size(), mimeType,
+#if QT_VERSION_MAJOR < 6
                                     QMediaResource(localUrl).resolution(),
+#else
+                                    {},
+#endif
                                     file.fileName());
 
         if (mimeTypeName.startsWith("audio/"))
-- 
cgit v1.2.3


From beb3a135a336dca654d967b88ea06a7457fbbec1 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sat, 12 Jun 2021 22:31:25 +0200
Subject: EncryptionEvent: fix "too perfect forwarding"

Now that QMetaType introspects into types, it reveals hidden problems
(which is very nice of it).
---
 lib/events/encryptionevent.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/events')

diff --git a/lib/events/encryptionevent.h b/lib/events/encryptionevent.h
index f9bbab12..65ee4187 100644
--- a/lib/events/encryptionevent.h
+++ b/lib/events/encryptionevent.h
@@ -40,6 +40,7 @@ public:
                                                           // default value
         : StateEvent(typeId(), obj)
     {}
+    EncryptionEvent(EncryptionEvent&&) = delete;
     template <typename... ArgTs>
     EncryptionEvent(ArgTs&&... contentArgs)
         : StateEvent(typeId(), matrixTypeId(), QString(),
-- 
cgit v1.2.3