summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2020-10-08 18:16:30 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2020-10-08 18:16:30 +0200
commite5fb9a25ea06f03129961a0df507361baae4b67a (patch)
treedb90ef291e939cda6dc5caaa36cbd5bf1cf2e978 /src
parentFix issues with old qt and bump to 5.10 (diff)
downloadnheko-e5fb9a25ea06f03129961a0df507361baae4b67a.tar.xz
Try to please the CI gods
Diffstat (limited to 'src')
-rw-r--r--src/DeviceVerificationFlow.h2
-rw-r--r--src/timeline/TimelineViewManager.cpp6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/DeviceVerificationFlow.h b/src/DeviceVerificationFlow.h

index 9ca45a94..d70374d9 100644 --- a/src/DeviceVerificationFlow.h +++ b/src/DeviceVerificationFlow.h
@@ -211,7 +211,7 @@ private: body[this->toClient][deviceId.toStdString()] = msg; http::client()->send_to_device<T>( - this->transaction_id, body, [this](mtx::http::RequestErr err) { + this->transaction_id, body, [](mtx::http::RequestErr err) { if (err) nhlog::net()->warn( "failed to send verification to_device message: {} {}", diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index b11c4965..7c81ca8f 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp
@@ -128,9 +128,11 @@ TimelineViewManager::TimelineViewManager(QSharedPointer<UserSettings> userSettin static auto self = this; qmlRegisterSingletonType<TimelineViewManager>( - "im.nheko", 1, 0, "TimelineManager", [](QQmlEngine *, QJSEngine *) { return self; }); + "im.nheko", 1, 0, "TimelineManager", [](QQmlEngine *, QJSEngine *) -> QObject * { + return self; + }); qmlRegisterSingletonType<UserSettings>( - "im.nheko", 1, 0, "Settings", [](QQmlEngine *, QJSEngine *) { + "im.nheko", 1, 0, "Settings", [](QQmlEngine *, QJSEngine *) -> QObject * { return self->settings.data(); });