diff --git a/src/libcalamares/utils/StringExpander.cpp b/src/libcalamares/utils/StringExpander.cpp
index 38093869d..eb082f0d6 100644
--- a/src/libcalamares/utils/StringExpander.cpp
+++ b/src/libcalamares/utils/StringExpander.cpp
@@ -11,6 +11,16 @@
 #include "StringExpander.h"
 #include "Logger.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
+// TODO: Qt6
+KWordMacroExpander::~KWordMacroExpander() {};
+bool
+KWordMacroExpander::expandMacro( const QString& str, QStringList& ret )
+{
+    return false;
+}
+#endif
+
 namespace Calamares
 {
 namespace String
diff --git a/src/libcalamares/utils/StringExpander.h b/src/libcalamares/utils/StringExpander.h
index e0b21bee8..e58286c8a 100644
--- a/src/libcalamares/utils/StringExpander.h
+++ b/src/libcalamares/utils/StringExpander.h
@@ -13,7 +13,44 @@
 
 #include "DllMacro.h"
 
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
 #include <KMacroExpander>
+#else
+// TODO: Qt6
+//
+// Mock up part of KF6
+#include <QHash>
+#include <QString>
+class KMacroExpanderBase
+{
+public:
+    QString expandMacrosShellQuote( const QString& c ) { return c; }
+};
+class KMacroExpander
+{
+public:
+    static QString expandMacros( const QString& source, const QHash< QString, QString > dict, char sep )
+    {
+        return source;
+    }
+};
+class KWordMacroExpander : public KMacroExpanderBase
+{
+public:
+    KWordMacroExpander( QChar c )
+        : m_escape( c )
+    {
+    }
+    virtual ~KWordMacroExpander();
+    virtual bool expandMacro( const QString& str, QStringList& ret );
+    void expandMacros( QString& s ) {}
+
+    QChar escapeChar() const { return m_escape; }
+
+private:
+    QChar m_escape;
+};
+#endif
 
 #include <QString>
 #include <QStringList>
@@ -25,6 +62,7 @@ namespace Calamares
 namespace String
 {
 
+
 /** @brief Expand variables in a string against a dictionary.
  *
  * This class provides a convenience API for building up a dictionary