Fix build when building with Qt 6.10.1 on Mac

diff --git a/WindCore/WindCore.pro b/WindCore/WindCore.pro
index f39561e48e3cb57d8216cf85d5c50a11c136366a..9353d7e17f3ec276407fdbd117edd66c0fd7c7b0 100644 (file)
--- a/WindCore/WindCore.pro
+++ b/WindCore/WindCore.pro
@@ -5,7 +5,7 @@
 #-------------------------------------------------
 
 QT       -= core gui
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15
 
 TARGET = WindCore
 TEMPLATE = lib

diff --git a/WindCore/arm710.h b/WindCore/arm710.h
index cb85566824d76cc3c1bf4b4e706b0565610c4a21..0b0f048f6dcc6a48e25699c8038171f8676a988b 100644 (file)
--- a/WindCore/arm710.h
+++ b/WindCore/arm710.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <functional>
 #include <stdint.h>
 #include <optional>
 #include <variant>

diff --git a/WindQt/WindQt.pro b/WindQt/WindQt.pro
index 9bab13161d84dacf17d5872830f575265776ecc0..1539a086b653e7719984a00f558e0126cb1719df 100644 (file)
--- a/WindQt/WindQt.pro
+++ b/WindQt/WindQt.pro
@@ -21,7 +21,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 CONFIG += c++17
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15
 
 SOURCES += \
         main.cpp \

diff --git a/WindQt/mainwindow.cpp b/WindQt/mainwindow.cpp
index deb706c8cd8e8a06f8df982925954c0b74838732..fafdfd9b2dd598bb35160ebca532be2c1b1cfd4b 100644 (file)
--- a/WindQt/mainwindow.cpp
+++ b/WindQt/mainwindow.cpp
@@ -209,7 +209,7 @@ void MainWindow::updateMemory()
                        if (!ok)
                                outLine.append('?');
                        else if (byte >= 0x20 && byte <= 0x7E)
-                               outLine.append(byte);
+                               outLine.append((QChar)byte);
                        else
                                outLine.append('.');
                }