From 686f4310f94bda0daa3452ea842dc431d4cd60fd Mon Sep 17 00:00:00 2001 From: Alejandro Martinez Date: Sat, 17 Jan 2026 13:56:31 -0300 Subject: [PATCH] Revert to Qt 6.5.3 for macOS builds A user reported having severe performance issues on macOS Tahoe with v3.8-DEV2601 not present when using v3.7-sp1 Besides 6.5.3 is LTS and 6.6.1 is deprecated, so lets play safe until we can upgrade to 6.8.3 --- appveyor.yml | 4 ++-- src/Train/KurtInRide.cpp | 5 +++++ src/src.pro | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 45328863a..79e430dce 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -81,8 +81,8 @@ init: qmake --version else export OS_NAME=macos - # Setup QT 6.6 - export QTDIR=$HOME/Qt/6.6/macos + # Setup QT 6.5 + export QTDIR=$HOME/Qt/6.5/macos export PATH=$QTDIR/bin:$PATH qmake --version # Setup Xcode 15.2 diff --git a/src/Train/KurtInRide.cpp b/src/Train/KurtInRide.cpp index d691c298a..33bce5a5f 100644 --- a/src/Train/KurtInRide.cpp +++ b/src/Train/KurtInRide.cpp @@ -160,7 +160,12 @@ void inride_BTDeviceInfoToSystemID(const QBluetoothDeviceInfo &devinfo, uint8_t quint128 be_uuid128 = uuid.toUInt128(); +// GC minimum Qt required for v3.8 is Qt6.5.3 +#if QT_VERSION < 0x060600 + addr64 = *(uint64_t*)be_uuid128.data; +#else addr64 = *(uint64_t*)&be_uuid128; +#endif } uint8_t* paddr64 = (uint8_t*)&addr64; diff --git a/src/src.pro b/src/src.pro index f8309c94e..95f1167e3 100644 --- a/src/src.pro +++ b/src/src.pro @@ -5,7 +5,7 @@ # # ############################################################################### -!versionAtLeast(QT_VERSION, 6.6.1):error("Use at least Qt version 6.6.1") +!versionAtLeast(QT_VERSION, 6.5.3):error("Use at least Qt version 6.5.3") ###========================== ### IMPORT USER CONFIGURATION