diff --git a/qbs/modules/windeployqt/windeployqt.qbs b/qbs/modules/windeployqt/windeployqt.qbs
index 8b6afe0c4..aacbb2d5b 100644
--- a/qbs/modules/windeployqt/windeployqt.qbs
+++ b/qbs/modules/windeployqt/windeployqt.qbs
@@ -143,7 +143,8 @@ Module {
                 else if (product.windeployqt.noCompilerRuntime)
                     cmdArgs.push("--no-compiler-runtime")
 
-                if (product.windeployqt.noVirtualkeyboard && Utilities.versionCompare(Qt.core.version, "6.5") < 0)
+                if (product.windeployqt.noVirtualkeyboard &&
+                        Utilities.versionCompare(product.Qt.core.version, "6.5") < 0)
                     cmdArgs.push("--no-virtualkeyboard")
 
                 if (product.windeployqt.json)
@@ -158,7 +159,7 @@ Module {
                 if (product.windeployqt.verbose !== undefined)
                     cmdArgs.push("--verbose", product.windeployqt.verbose)
 
-                cmdArgs.push(product.installDir + "/" + input.fileName);
+                cmdArgs.push(product.installDir + "\\" + input.fileName);
 
                 var cmd = new Command(product.Qt.core.binPath + "/" + windeployqtProgram, cmdArgs);
                 cmd.jobPool = "windeployqt";
diff --git a/src/libs/vformat/vsinglelineoutlinechar.cpp b/src/libs/vformat/vsinglelineoutlinechar.cpp
index f67c32029..5d121d722 100644
--- a/src/libs/vformat/vsinglelineoutlinechar.cpp
+++ b/src/libs/vformat/vsinglelineoutlinechar.cpp
@@ -71,7 +71,7 @@ Q_REQUIRED_RESULT auto ParseCorrectiosn(const QJsonObject &correctionsObject) ->
         for (auto segmentsIt = segmentsObject.constBegin(); segmentsIt != segmentsObject.constEnd(); ++segmentsIt)
         {
             bool correct = segmentsIt.value().toBool();
-            if (not correct)
+            if (!correct)
             {
                 segments.insert(segmentsIt.key().toInt(), correct);
             }
diff --git a/src/libs/vmisc/compatibility.h b/src/libs/vmisc/compatibility.h
index ecea08bb3..900bb1108 100644
--- a/src/libs/vmisc/compatibility.h
+++ b/src/libs/vmisc/compatibility.h
@@ -409,4 +409,14 @@ template <typename T, typename N> inline auto Sliced(const T &list, N pos, N n)
 #endif
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+inline auto Back(const QString &str) -> QChar
+{
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    return str.back();
+#else
+    return str.at(str.size() - 1);
+#endif
+}
+
 #endif // COMPATIBILITY_H
diff --git a/src/libs/vmisc/svgfont/vsvgfontreader.h b/src/libs/vmisc/svgfont/vsvgfontreader.h
index 3d2f6fd08..5626f6867 100644
--- a/src/libs/vmisc/svgfont/vsvgfontreader.h
+++ b/src/libs/vmisc/svgfont/vsvgfontreader.h
@@ -32,6 +32,10 @@
 #include <QString>
 #include <QXmlStreamReader>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
+#include "../defglobal.h"
+#endif
+
 class QFile;
 class VSvgFont;
 class VSvgFontEngine;
diff --git a/src/libs/vmisc/svgfont/vsvgpathtokenizer.cpp b/src/libs/vmisc/svgfont/vsvgpathtokenizer.cpp
index 24570e022..9d3a39cec 100644
--- a/src/libs/vmisc/svgfont/vsvgpathtokenizer.cpp
+++ b/src/libs/vmisc/svgfont/vsvgpathtokenizer.cpp
@@ -33,9 +33,11 @@
 #include <QtMath>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-#include "../vmisc/diagnostic.h"
+#include "../diagnostic.h"
 #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
+#include "../compatibility.h"
+
 namespace
 {
 QT_WARNING_PUSH
@@ -68,12 +70,12 @@ auto IsSeparator(const QString &currentToken, const QChar &ch) -> bool
         return true;
     }
 
-    if (ch == '-' && !currentToken.isEmpty() && currentToken.back() != 'e' && currentToken.back() != 'E')
+    if (ch == '-' && !currentToken.isEmpty() && Back(currentToken) != 'e' && Back(currentToken) != 'E')
     {
         return true;
     }
 
-    if (ch == '+' && !currentToken.isEmpty() && currentToken.back() != 'e' && currentToken.back() != 'E')
+    if (ch == '+' && !currentToken.isEmpty() && Back(currentToken) != 'e' && Back(currentToken) != 'E')
     {
         return true;
     }
diff --git a/src/libs/vmisc/svgfont/vsvgpathtokenizer.h b/src/libs/vmisc/svgfont/vsvgpathtokenizer.h
index 8f2d55051..49e42a733 100644
--- a/src/libs/vmisc/svgfont/vsvgpathtokenizer.h
+++ b/src/libs/vmisc/svgfont/vsvgpathtokenizer.h
@@ -34,6 +34,10 @@
 #include <QPointF>
 #include <QString>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
+#include "../defglobal.h"
+#endif
+
 class QPainterPath;
 
 struct VSVGPathCommand