Merge branch 'dev'

The result is FTBFS as yet; next commits will fix that, along with a few
other things.

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/mxcreply.h b/lib/mxcreply.h
index efaf01c6..f6c4a34d 100644
--- a/lib/mxcreply.h
+++ b/lib/mxcreply.h
@@ -3,14 +3,16 @@
 
 #pragma once
 
+#include "util.h"
+
 #include <QtNetwork/QNetworkReply>
-#include <memory>
 
 namespace Quotient {
 class Room;
 
-class MxcReply : public QNetworkReply
+class QUOTIENT_API MxcReply : public QNetworkReply
 {
+    Q_OBJECT
 public:
     explicit MxcReply();
     explicit MxcReply(QNetworkReply *reply);
@@ -24,6 +26,6 @@ protected:
 
 private:
     class Private;
-    std::unique_ptr<Private> d;
+    ImplPtr<Private> d;
 };
 }