From: George Wright Date: Wed, 24 Jun 2026 07:55:13 +0000 (-0700) Subject: Fix build when building with Qt 6.10.1 on Mac X-Git-Url: http://git.gwright.org.uk/?a=commitdiff_plain;h=abbfa89a98ddec53725533b9bcc8e150ae1ba916;p=WindEmu.git Fix build when building with Qt 6.10.1 on Mac --- diff --git a/WindCore/WindCore.pro b/WindCore/WindCore.pro index f39561e..9353d7e 100644 --- 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 cb85566..0b0f048 100644 --- a/WindCore/arm710.h +++ b/WindCore/arm710.h @@ -1,4 +1,5 @@ #pragma once +#include #include #include #include diff --git a/WindQt/WindQt.pro b/WindQt/WindQt.pro index 9bab131..1539a08 100644 --- 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 deb706c..fafdfd9 100644 --- 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('.'); }