From 03ca4fdbc32d942f6efa42f5359a473366ece5be Mon Sep 17 00:00:00 2001
From: Magnus Gille <mgille@gmail.com>
Date: Sun, 21 Dec 2025 13:24:27 -0800
Subject: [PATCH] Parallelize builds and upgrade build environments (#4749)

* Parallelize QWT builds
* Upgrade macOS Builds to Sonoma with Xcode 15.2 and Qt 6.6
* Upgrade Windows builds to Visual Studio 2022
---
 appveyor.yml                                 | 20 ++++++++++----------
 qwt/src/src.pro                              |  1 +
 src/Resources/win32/GC3.7-Master-W64-QT6.nsi |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 13a7b8bd5..a38667779 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,9 +6,9 @@ branches:
     - master
 
 image:
-  - macos-monterey
+  - Visual Studio 2022
   - Ubuntu2204
-  - Visual Studio 2019
+  - macos-sonoma
 
 environment:
   APPVEYOR_SAVE_CACHE_ON_ERROR: true
@@ -58,8 +58,8 @@ init:
 - cmd: set QTDIR=C:\Qt\6.8\msvc2022_64
 - cmd: set PATH=%QTDIR%\bin;%PATH%
 - cmd: qmake --version
-# Setup MSVC - VS 2019
-- cmd: call c:\"Program Files (x86)"\"Microsoft Visual Studio"\2019\Community\VC\Auxiliary\Build\vcvarsall.bat amd64
+# Setup MSVC - VS 2022
+- cmd: call c:\"Program Files"\"Microsoft Visual Studio"\2022\Community\VC\Auxiliary\Build\vcvarsall.bat amd64
 # Setup NSIS
 - cmd: set PATH=%PATH%;C:\"Program Files (x86)"\NSIS
 # install Python 3.7
@@ -81,12 +81,12 @@ init:
       qmake --version
     else
       export OS_NAME=macos
-      # Setup QT 6.5
-      export QTDIR=$HOME/Qt/6.5/macos
+      # Setup QT 6.6
+      export QTDIR=$HOME/Qt/6.6/macos
       export PATH=$QTDIR/bin:$PATH
       qmake --version
-      # Setup Xcode 14.2
-      sudo xcode-select -s /Applications/Xcode-14.2.0.app
+      # Setup Xcode 15.2
+      sudo xcode-select -s /Applications/Xcode-15.2.0.app
     fi
 
 cache:
@@ -223,12 +223,12 @@ build_script:
 
 # Windows
 - cmd: qmake.exe build.pro -r -spec win32-msvc
-- cmd: if not exist qwt\lib\qwt.lib jom -j1 sub-qwt
+- cmd: if not exist qwt\lib\qwt.lib jom -j2 sub-qwt
 - cmd: jom -j2 sub-src
 
 # Linux / macOS
 - sh: qmake build.pro -r QMAKE_CXXFLAGS_WARN_ON+="-Wno-unused-private-field -Wno-c++11-narrowing -Wno-deprecated-declarations -Wno-deprecated-register -Wno-nullability-completeness -Wno-sign-compare -Wno-inconsistent-missing-override" QMAKE_CFLAGS_WARN_ON+="-Wno-deprecated-declarations -Wno-sign-compare"
-- sh: if test ! -f qwt/lib/libqwt.a; then make sub-qwt; fi
+- sh: if test ! -f qwt/lib/libqwt.a; then make -j2 sub-qwt; fi
 - sh: make -j2 sub-src
 
 after_build:
diff --git a/qwt/src/src.pro b/qwt/src/src.pro
index 7bf618d55..4987e3186 100644
--- a/qwt/src/src.pro
+++ b/qwt/src/src.pro
@@ -16,6 +16,7 @@ include( $${QWT_ROOT}/qwtfunctions.pri )
 
 # Fix for parallel build race condition where moc_predefs.h is missing
 compiler_moc_header_make_all.depends += compiler_moc_predefs_make_all
+compiler_moc_source_make_all.depends += compiler_moc_predefs_make_all
 
 QWT_OUT_ROOT = $${OUT_PWD}/..
 
diff --git a/src/Resources/win32/GC3.7-Master-W64-QT6.nsi b/src/Resources/win32/GC3.7-Master-W64-QT6.nsi
index 390228f35..498493535 100644
--- a/src/Resources/win32/GC3.7-Master-W64-QT6.nsi
+++ b/src/Resources/win32/GC3.7-Master-W64-QT6.nsi
@@ -310,7 +310,7 @@ Section /o "Visual C++ Redistributable" Sec2
 SectionEnd
 
 LangString DESC_Sec1 ${LANG_ENGLISH} "Golden Cheetah for Windows - 64Bit"
-LangString DESC_Sec2 ${LANG_ENGLISH} "Microsoft Visual C++ 2015-2019 Redistributable (x64) is required to run Golden Cheetah for Windows"
+LangString DESC_Sec2 ${LANG_ENGLISH} "Microsoft Visual C++ 2015-2022 Redistributable (x64) is required to run Golden Cheetah for Windows"
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${Sec1} $(DESC_Sec1)