aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2017-09-01 10:29:33 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2017-09-01 19:48:36 +0900
commit45c138903c20d32a8a69b5637a72898bc690f1f1 (patch)
tree9ad3c1a2502f6db178ef48b857e26b17cd780615
parent3ce6dd3db9480b017f89a977d4333f01f25f2cff (diff)
downloadlibquotient-45c138903c20d32a8a69b5637a72898bc690f1f1.tar.gz
libquotient-45c138903c20d32a8a69b5637a72898bc690f1f1.zip
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.
-rw-r--r--jobs/basejob.h1
1 files changed, 1 insertions, 0 deletions
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))