Merge branch '1.8'

olomono · Aug 22, 2024 · 63178ac · 63178ac
2 parents 23a3d97 + 1935fde
commit 63178ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/base/QXmppStreamError.h b/src/base/QXmppStreamError.h
@@ -22,6 +22,7 @@ enum class StreamError {
     ImproperAddressing,
     InternalServerError,
     InvalidFrom,
+    InvalidId,
     InvalidNamespace,
     InvalidXml,
     NotAuthorized,

diff --git a/src/base/Stream.cpp b/src/base/Stream.cpp
@@ -97,6 +97,7 @@ constexpr auto STREAM_ERROR_CONDITIONS = to_array<QStringView>({
     u"system-shutdown",
     u"undefined-condition",
     u"unsupported-encoding",
+    u"unsupported-feature",
     u"unsupported-stanza-type",
     u"unsupported-version",
 });