From 31c3fbd0a96c5e0e34d45f2b71e041ef3ca8374a Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Sat, 4 Jul 2026 18:32:48 -0400
Subject: [PATCH] Fix Qt5 build

---
 .github/workflows/main.yml | 2 +-
 include/log/log.h          | 5 +++++
 include/log/logstatusbar.h | 1 +
 src/core/paletteutil.cpp   | 2 ++
 src/core/parseutil.cpp     | 1 +
 src/log/logstatusbar.cpp   | 2 ++
 src/log/logwriter.cpp      | 6 ++++++
 7 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 57fbb286..5145dbc2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -58,7 +58,7 @@ jobs:
         uses: jurplel/install-qt-action@v4
         with:
           # 6.10 is the first Qt version (by release date) to support macOS 26
-          version: '6.10.*'
+          version: '6.11.*'
           modules: 'qtcharts'
           cache: 'true'
 
diff --git a/include/log/log.h b/include/log/log.h
index e1ce981d..1abac854 100644
--- a/include/log/log.h
+++ b/include/log/log.h
@@ -3,6 +3,7 @@
 #define LOG_H
 
 #include <QString>
+#include <QHash>
 
 enum class LogType {
     LOG_ERROR,
@@ -10,6 +11,10 @@ enum class LogType {
     LOG_INFO,
 };
 
+inline uint qHash(const LogType &key, uint seed = 0) {
+    return qHash(static_cast<int>(key), seed);
+}
+
 void logInit();
 void logInfo(const QString &message);
 void logWarn(const QString &message);
diff --git a/include/log/logstatusbar.h b/include/log/logstatusbar.h
index a0e38129..63b04bf5 100644
--- a/include/log/logstatusbar.h
+++ b/include/log/logstatusbar.h
@@ -6,6 +6,7 @@
 
 #include <QLabel>
 #include <QStatusBar>
+#include <QSet>
 #include <QTimer>
 
 class LogStatusBar : public QStatusBar
diff --git a/src/core/paletteutil.cpp b/src/core/paletteutil.cpp
index 76a3d0c4..ede3daad 100644
--- a/src/core/paletteutil.cpp
+++ b/src/core/paletteutil.cpp
@@ -1,9 +1,11 @@
 #include "paletteutil.h"
 #include "advancemapparser.h"
 #include "log.h"
+
 #include <QFileInfo>
 #include <QRegularExpression>
 #include <QString>
+#include <QTextStream>
 
 QList<QRgb> parsePal(QString filepath, bool *error);
 QList<QRgb> parseJASC(QString filepath, bool *error);
diff --git a/src/core/parseutil.cpp b/src/core/parseutil.cpp
index 052fee8a..01e5090a 100644
--- a/src/core/parseutil.cpp
+++ b/src/core/parseutil.cpp
@@ -7,6 +7,7 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QStack>
+#include <QSet>
 
 #include "lib/fex/lexer.h"
 #include "lib/fex/parser.h"
diff --git a/src/log/logstatusbar.cpp b/src/log/logstatusbar.cpp
index 03589a8c..11e84450 100644
--- a/src/log/logstatusbar.cpp
+++ b/src/log/logstatusbar.cpp
@@ -1,6 +1,8 @@
 #include "logstatusbar.h"
 #include "logsignaler.h"
 
+#include <QMap>
+
 LogStatusBar::LogStatusBar(QWidget* parent) : QStatusBar(parent) {
     addWidget(&m_icon);
     addWidget(&m_message);
diff --git a/src/log/logwriter.cpp b/src/log/logwriter.cpp
index e7d3835c..de1bf458 100644
--- a/src/log/logwriter.cpp
+++ b/src/log/logwriter.cpp
@@ -29,6 +29,7 @@ QString colorizeMessage(const QString &message, LogType type) {
     case LogType::LOG_WARN:  return colorizeTypeName(message, "WARN", WARNING_COLOR);
     case LogType::LOG_ERROR: return colorizeTypeName(message, "ERROR", ERROR_COLOR);
     }
+    return QString();
 }
 
 QString colorizeMessage(const QString &message, QtMsgType type) {
@@ -39,6 +40,7 @@ QString colorizeMessage(const QString &message, QtMsgType type) {
     case QtCriticalMsg: return colorizeTypeName(message, "QT ERROR", ERROR_COLOR);
     case QtFatalMsg:    return colorizeTypeName(message, "QT FATAL", ERROR_COLOR);
     }
+    return QString();
 }
 
 std::ostream& consoleStream(LogType type) {
@@ -49,6 +51,7 @@ std::ostream& consoleStream(LogType type) {
     case LogType::LOG_ERROR:
         return std::cerr;
     }
+    return std::cout;
 }
 
 std::ostream& consoleStream(QtMsgType type) {
@@ -61,6 +64,7 @@ std::ostream& consoleStream(QtMsgType type) {
     case QtFatalMsg:
         return std::cerr;
     }
+    return std::cout;
 }
 
 QString prefix(LogType type) {
@@ -69,6 +73,7 @@ QString prefix(LogType type) {
     case LogType::LOG_WARN:  return QStringLiteral("    [WARN]");
     case LogType::LOG_ERROR: return QStringLiteral("   [ERROR]");
     }
+    return QString();
 }
 
 QString prefix(QtMsgType type) {
@@ -79,6 +84,7 @@ QString prefix(QtMsgType type) {
     case QtCriticalMsg:      return QStringLiteral("[QT ERROR]");
     case QtFatalMsg:         return QStringLiteral("[QT FATAL]");
     }
+    return QString();
 }