thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into nhekoRoomDirectory

Browse source
This commit is contained in:
kamathmanu 2021-08-07 21:20:43 +00:00 • committed by GitHub
commit 2dfccda73c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 2099 additions and 1313 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/timeline/TimelineViewManager.cpp
View file

@ -161,6 +161,8 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par
0,
"MtxEvent",
"Can't instantiate enum!");
qmlRegisterUncreatableMetaObject(
olm::staticMetaObject, "im.nheko", 1, 0, "Olm", "Can't instantiate enum!");
qmlRegisterUncreatableMetaObject(
crypto::staticMetaObject, "im.nheko", 1, 0, "Crypto", "Can't instantiate enum!");
qmlRegisterUncreatableMetaObject(verification::staticMetaObject,
@ -210,6 +212,12 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par
0,
"InviteesModel",
"InviteesModel needs to be instantiated on the C++ side");
qmlRegisterUncreatableType<ReadReceiptsProxy>(
"im.nheko",
1,
0,
"ReadReceiptsProxy",
"ReadReceiptsProxy needs to be instantiated on the C++ side");
static auto self = this;
qmlRegisterSingletonType<MainWindow>(