Merge PR #5609: BUILD(client): Fix various issues

See individual commits for details

Fixes #5606

5 files changed, 12 insertions, 1 deletions

diff --git a/src/mumble/Markdown.cpp b/src/mumble/Markdown.cpp
index fbd88f678..cd041787e 100644
--- a/src/mumble/Markdown.cpp
+++ b/src/mumble/Markdown.cpp
@@ -343,7 +343,7 @@ void escapeCharacter(QString &str, int &offset) {
 
 	tmp = tmp.toHtmlEscaped();
 
-	if (tmp.size() == 1 && tmp == str[offset]) {
+	if (tmp.size() == 1 && tmp[0] == str[offset]) {
 		// Nothing to escape
 		return;
 	}
diff --git a/src/mumble/PluginManifest.cpp b/src/mumble/PluginManifest.cpp
index fa69c0c3e..40acb29d3 100644
--- a/src/mumble/PluginManifest.cpp
+++ b/src/mumble/PluginManifest.cpp
@@ -9,6 +9,7 @@
 
 #include <Poco/DOM/DOMParser.h>
 #include <Poco/DOM/Document.h>
+#include <Poco/DOM/Element.h>
 #include <Poco/DOM/NodeList.h>
 #include <Poco/SAX/InputSource.h>
 #include <Poco/SAX/SAXException.h>
diff --git a/src/mumble/QtWidgetUtils.cpp b/src/mumble/QtWidgetUtils.cpp
index c329d832f..32ab98edb 100644
--- a/src/mumble/QtWidgetUtils.cpp
+++ b/src/mumble/QtWidgetUtils.cpp
@@ -11,6 +11,8 @@
 #include <QTextCursor>
 #include <QTextDocument>
 
+#include <cstdint>
+
 namespace Mumble {
 namespace QtUtils {
 	QScreen *screenAt(QPoint point) {
diff --git a/src/mumble/QtWidgetUtils.h b/src/mumble/QtWidgetUtils.h
index 4702c94a0..3972131e3 100644
--- a/src/mumble/QtWidgetUtils.h
+++ b/src/mumble/QtWidgetUtils.h
@@ -6,6 +6,8 @@
 #ifndef MUMBLE_MUMBLE_QTWIDGETUTILS_H_
 #define MUMBLE_MUMBLE_QTWIDGETUTILS_H_
 
+#include <cstdint>
+
 #include <QPoint>
 
 class QScreen;
diff --git a/src/mumble/SearchDialog.cpp b/src/mumble/SearchDialog.cpp
index dfc228b2c..009aa8829 100644
--- a/src/mumble/SearchDialog.cpp
+++ b/src/mumble/SearchDialog.cpp
@@ -489,7 +489,13 @@ void SearchDialog::keyPressEvent(QKeyEvent *event) {
 		return;
 	}
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
 	if (event->matches(QKeySequence::Cancel)) {
+#else
+	// Before Qt 5.6, no standard key for the cancel operation was defined. Thus, in these cases, we hardcode it to be
+	// Escape
+	if (event->key() == Qt::Key_Escape) {
+#endif
 		event->accept();
 		// Mimic behavior of dialogs (close on Esc)
 		close();