From 3cb7982fda8c0049eff51a9ab65eb43667e2c4ce Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 13 Jan 2019 17:53:22 +0900
Subject: Fix building with Qt before 5.10

See https://bugreports.qt.io/browse/QTBUG-60339
---
 lib/qt_connection_util.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/qt_connection_util.h b/lib/qt_connection_util.h
index 2df2b186..c2bde8df 100644
--- a/lib/qt_connection_util.h
+++ b/lib/qt_connection_util.h
@@ -30,11 +30,16 @@ namespace QMatrixClient {
                 SenderT* sender, SignalT signal, ContextT* context,
                 std::function<bool(ArgTs...)> slot, Qt::ConnectionType connType)
         {
+            // See https://bugreports.qt.io/browse/QTBUG-60339
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
+            auto pc = std::make_shared<QMetaObject::Connection>();
+#else
             auto pc = std::make_unique<QMetaObject::Connection>();
+#endif
             auto& c = *pc; // Resolve a reference before pc is moved to lambda
             c = QObject::connect(sender, signal, context,
                 [pc=std::move(pc),slot] (ArgTs... args) {
-                    Q_ASSERT(*pc);
+                    Q_ASSERT(*pc); // If it's been triggered, it should exist
                     if (slot(std::forward<ArgTs>(args)...))
                         QObject::disconnect(*pc);
             }, connType);
-- 
cgit v1.2.3