summary refs log tree commit diff
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2024-07-25 20:27:07 +0000
committerGitHub <noreply@github.com>2024-07-25 20:27:07 +0000
commitdeba5586a3770bd41b2a3191567ad5c7da72781e (patch)
tree766de436d9ffc2f0f29c485b2901278114d9c441
parentNlohmann is in brew repos now so remove tap (diff)
parentFixed build against fmt 11. (diff)
downloadnheko-deba5586a3770bd41b2a3191567ad5c7da72781e.tar.xz
Merge pull request #1776 from xvitaly/fmt11
Fixed build against fmt 11
-rw-r--r--src/RegisterPage.cpp2
-rw-r--r--src/Utils.cpp1
-rw-r--r--src/encryption/DeviceVerificationFlow.cpp1
3 files changed, 4 insertions, 0 deletions
diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp

index 93e2cf1b..562d2c82 100644 --- a/src/RegisterPage.cpp +++ b/src/RegisterPage.cpp
@@ -4,6 +4,8 @@ #include <set> +#include <fmt/ranges.h> + #include <mtx/responses/common.hpp> #include <mtx/responses/register.hpp> #include <mtx/responses/version.hpp> diff --git a/src/Utils.cpp b/src/Utils.cpp
index 3e7340f4..99d337c4 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp
@@ -26,6 +26,7 @@ #include <QWindow> #include <QXmlStreamReader> +#include <fmt/ranges.h> #include <nlohmann/json.hpp> #include <cmark.h> diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
index cb595df0..0757d88c 100644 --- a/src/encryption/DeviceVerificationFlow.cpp +++ b/src/encryption/DeviceVerificationFlow.cpp
@@ -9,6 +9,7 @@ #include <QDateTime> #include <QTimer> +#include <fmt/ranges.h> #include <nlohmann/json.hpp> #include "Cache.h"