diff options
| author | Linus Jahn <lnj@kaidan.im> | 2023-02-01 20:53:09 +0100 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2023-02-01 20:53:09 +0100 |
| commit | 9290e53d32c862b69a15547a436d578394a08940 (patch) | |
| tree | 1c39bbef9cd3241a6436eb1fc6f2c146f9492f3a | |
| parent | 1a79303169e245891a911174b6f1fa87fd177597 (diff) | |
| parent | 9a1969f8454c3799bdccaefc74e6bd556a866fc0 (diff) | |
Merge branch '1.5'
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | src/client/QXmppClient.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e50a2d93..1e235b35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ QXmpp 1.6.0 (UNRELEASED) *under development* +QXmpp 1.5.1 (Feb 01, 2023) +-------------------------- + +Fixes: + - Fix build with clang (usage of auto in template argument) (@lnjX) + QXmpp 1.5.0 (Jan 31, 2023) -------------------------- diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp index 2e5f64f9..dbbfd9e1 100644 --- a/src/client/QXmppClient.cpp +++ b/src/client/QXmppClient.cpp @@ -412,7 +412,7 @@ bool QXmppClient::sendPacket(const QXmppNonza &packet) /// QXmppTask<QXmpp::SendResult> QXmppClient::sendSensitive(QXmppStanza &&stanza, const std::optional<QXmppSendStanzaParams> ¶ms) { - const auto sendEncrypted = [this](QXmppTask<auto> &&task) { + const auto sendEncrypted = [this](auto &&task) { QXmppPromise<QXmpp::SendResult> interface; task.then(this, [this, interface](auto &&result) mutable { std::visit(overloaded { |