diff options
| author | Hnatiuk Vladyslav <aders1234@gmail.com> | 2022-01-02 11:27:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-02 11:27:33 +0100 |
| commit | 8730fb0782860f278760e369b9f42f266f0572b3 (patch) | |
| tree | ea6b22c418e20a03282483bd599aa79db2e2e6cc /lib/converters.h | |
| parent | ca6a104941b71e7b6a8bdcb6ebcdfff5ec8e8aca (diff) | |
| parent | d516280a2b38ccb060e4f7502b873e19b1559ed1 (diff) | |
| download | libquotient-8730fb0782860f278760e369b9f42f266f0572b3.tar.gz libquotient-8730fb0782860f278760e369b9f42f266f0572b3.zip | |
Merge branch 'quotient-im:dev' into fix-qt-6
Diffstat (limited to 'lib/converters.h')
| -rw-r--r-- | lib/converters.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/converters.h b/lib/converters.h index 9c3d5749..a6028f1b 100644 --- a/lib/converters.h +++ b/lib/converters.h @@ -183,7 +183,7 @@ struct JsonConverter<QUrl> { }; template <> -struct JsonConverter<QVariant> { +struct QUOTIENT_API JsonConverter<QVariant> { static QJsonValue dump(const QVariant& v); static QVariant load(const QJsonValue& jv); }; @@ -281,9 +281,9 @@ template <typename T> struct JsonObjectConverter<QHash<QString, T>> : public HashMapFromJson<QHash<QString, T>> {}; -QJsonObject toJson(const QVariantHash& vh); +QJsonObject QUOTIENT_API toJson(const QVariantHash& vh); template <> -QVariantHash fromJson(const QJsonValue& jv); +QVariantHash QUOTIENT_API fromJson(const QJsonValue& jv); // Conditional insertion into a QJsonObject |