From b0b65e4e1fb76914cbabc1a1ee0f396b38d27874 Mon Sep 17 00:00:00 2001 From: Alejandro Martinez Date: Sun, 21 Dec 2025 21:35:44 -0300 Subject: [PATCH] Update minimum Qt version 6.6.1 recommended 6.8.3 --- INSTALL-MAC | 6 +++--- INSTALL-WIN32 | 11 +++++------ src/Train/KurtInRide.cpp | 5 ----- src/src.pro | 2 +- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/INSTALL-MAC b/INSTALL-MAC index 8c9fe2d5d..a68467990 100644 --- a/INSTALL-MAC +++ b/INSTALL-MAC @@ -115,8 +115,8 @@ $ brew install Qt6 Follow the instructions to add Qt to PATH and test using: $ qmake --version -You can also install Qt5 this way currently, but if you want to install other specific -Qt version you need to download and install the Qt SDK from http://qt-project.org/ +If you want to install other specific Qt version you need to download and install +the Qt SDK from http://qt-project.org/ You can use a browser to download and run the interactive installer and select a Qt version, including at least the following modules: - Desktop macOS @@ -124,7 +124,7 @@ a Qt version, including at least the following modules: - Qt WebEngine under Extensions Once this step is completed add the bin directory to PATH and test qmake is ok: $ qmake --version -For v3.7 we are using both Qt 5.15.2 and Qt 6.8.3 LTS versions. +For v3.7 and later we recommend Qt 6.8.3 LTS version. 1.6 Install GSL and Bison ------------------------- diff --git a/INSTALL-WIN32 b/INSTALL-WIN32 index 4e8e114c9..bd06e9b3d 100644 --- a/INSTALL-WIN32 +++ b/INSTALL-WIN32 @@ -1,11 +1,10 @@ Update Note: to build GoldenCheetah v3.6 we are using Microsoft Visual C++ 2019, -included in Microsoft Visual Studio 2019 AppVeyor image, with Qt5.15.2 and GSL 2.7 -installed with vcpkg, on AppVeyor continuous integration platform. -You can check the appveyor.yml for the complete and updated build script, -the minimum Qt version known to work is 5.13 with Qt WebEngine and Qt Charts. -GSL - GNU Scientific Library is a mandatory dependency starting with v3.6 +included in Microsoft Visual Studio 2022 AppVeyor image, using Qt6.8.3 with +Qt WebEngine and Qt Charts, and GSL 2.8 installed with vcpkg on AppVeyor +continuous integration platform. +You can check the appveyor.yml for the complete and updated build script. -Ale Martinez - Jul, 2022 +Ale Martinez - Dec, 2025 +++++++++++++++++++++++ WIN32 BUILD WALKTHROUGH +++++++++++++++++++++++ diff --git a/src/Train/KurtInRide.cpp b/src/Train/KurtInRide.cpp index 33bce5a5f..d691c298a 100644 --- a/src/Train/KurtInRide.cpp +++ b/src/Train/KurtInRide.cpp @@ -160,12 +160,7 @@ 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 1d012a4be..f414821ce 100644 --- a/src/src.pro +++ b/src/src.pro @@ -5,7 +5,7 @@ # # ############################################################################### -!versionAtLeast(QT_VERSION, 6.5.3):error("Use at least Qt version 6.5.3") +!versionAtLeast(QT_VERSION, 6.6.1):error("Use at least Qt version 6.6.1") ###========================== ### IMPORT USER CONFIGURATION