diff options
author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-01-14 00:01:38 +0900 |
---|---|---|
committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-01-14 00:01:38 +0900 |
commit | f5b4c73ee571121f7b7505f03d9b1da7036aff32 (patch) | |
tree | eb22b75823ef409285bb6e9d788c3e5ce10c8898 /events | |
parent | a671d1aeff6bc9c01aa4204e0c05da894c72b603 (diff) | |
parent | f8f7fb7a00e5100881e347f18e96a5b1a8f56227 (diff) | |
download | libquotient-f5b4c73ee571121f7b7505f03d9b1da7036aff32.tar.gz libquotient-f5b4c73ee571121f7b7505f03d9b1da7036aff32.zip |
Merge branch 'master' into kitsune-content-repo-create-room
Diffstat (limited to 'events')
-rw-r--r-- | events/event.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/events/event.h b/events/event.h index 319c3443..6ed5ba49 100644 --- a/events/event.h +++ b/events/event.h @@ -290,7 +290,7 @@ namespace QMatrixClient QScopedPointer<ContentT> _prev; }; } // namespace QMatrixClient -Q_DECLARE_OPAQUE_POINTER(QMatrixClient::Event*) Q_DECLARE_METATYPE(QMatrixClient::Event*) -Q_DECLARE_OPAQUE_POINTER(QMatrixClient::RoomEvent*) Q_DECLARE_METATYPE(QMatrixClient::RoomEvent*) +Q_DECLARE_METATYPE(const QMatrixClient::Event*) +Q_DECLARE_METATYPE(const QMatrixClient::RoomEvent*) |