From 45c138903c20d32a8a69b5637a72898bc690f1f1 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 1 Sep 2017 10:29:33 +0900 Subject: BaseJob::Data: expose constructors from QJsonObject We had a stupid situation when this class has less features when compiled with newer Qt because we explicitly added a constructor from std::initializer_list for older Qt versions but did not reuse the same constructor from QJsonObject for newer versions. --- jobs/basejob.h | 1 + 1 file changed, 1 insertion(+) diff --git a/jobs/basejob.h b/jobs/basejob.h index 5df03b32..b8cc9511 100644 --- a/jobs/basejob.h +++ b/jobs/basejob.h @@ -77,6 +77,7 @@ namespace QMatrixClient class Data : public QJsonObject { public: + using QJsonObject::QJsonObject; Data() = default; explicit Data(const QJsonObject& o) : QJsonObject(o) { } #if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0)) -- cgit v1.2.3