Upgrade Qt to 6.5.3 for AppVeyor macOS builds

Using Qt6 video instead of VLC

appveyor.yml

@@ -58,9 +58,9 @@ init:
 - cmd: set PATH=%PATH%;C:\"Program Files (x86)"\NSIS
 
 # macOS
-# Setup QT 5.15
-- sh: export QTDIR=$HOME/Qt/5.15.2/clang_64
-- sh: export PATH=$HOME/Qt/5.15.2/clang_64/bin:$PATH
+# Setup QT 6.5
+- sh: export QTDIR=$HOME/Qt/6.5/macos
+- sh: export PATH=$HOME/Qt/6.5/macos/bin:$PATH
 - sh: qmake --version
 # Setup Xcode 14.2
 - sh: sudo xcode-select -s /Applications/Xcode-14.2.0.app
@@ -72,9 +72,8 @@ cache:
 - C:\R
 - C:\Python -> src\Python\requirements.txt
 - c:\tools\vcpkg\installed\
-- qwt -> qwt/qwtconfig.pri.in
+- qwt -> qwt/qwtconfig.pri.in, appveyor.yml
 - D2XX
-- VLC
 - site-packages
 
 install:

appveyor/macos/after_build.sh

@@ -5,10 +5,6 @@ cd src
 echo "About to create dmg file and fix up"
 mkdir GoldenCheetah.app/Contents/Frameworks
 
-# Add VLC dylibs and plugins
-cp ../VLC/lib/libvlc.dylib ../VLC/lib/libvlccore.dylib GoldenCheetah.app/Contents/Frameworks
-cp -R ../VLC/plugins GoldenCheetah.app/Contents/Frameworks
-
 # This is a hack to include libicudata.*.dylib, not handled by macdployqt[fix]
 cp /usr/local/opt/icu4c/lib/libicudata.*.dylib GoldenCheetah.app/Contents/Frameworks
 
@@ -28,26 +24,8 @@ install_name_tool -change $OLD_PATH "@executable_path/../../../../Python" Golden
 rm -r GoldenCheetah.app/Contents/Frameworks/Python.framework/Versions/3.7/lib/python3.7/site-packages
 cp -R ../site-packages GoldenCheetah.app/Contents/Frameworks/Python.framework/Versions/3.7/lib/python3.7
 
-# Initial deployment using macdeployqt
-macdeployqt GoldenCheetah.app -verbose=2 -executable=GoldenCheetah.app/Contents/MacOS/GoldenCheetah
-
-# Fix QtWebEngineProcess due to bug in macdployqt from homebrew
-if [ ! -f GoldenCheetah.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess ]; then
-    cp -Rafv /usr/local/Cellar/qt/5.15.?/lib/QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app/Contents GoldenCheetah.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app
-fi
-
-pushd GoldenCheetah.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS
-for LIB in QtGui QtCore QtWebEngineCore QtQuick QtWebChannel QtNetwork QtPositioning QtQmlModels QtQml
-do
-    OLD_PATH=`otool -L QtWebEngineProcess | grep ${LIB}.framework | cut -f 1 -d ' '`
-    NEW_PATH="@loader_path/../../../../../../../${LIB}.framework/${LIB}"
-    echo ${OLD_PATH} ${NEW_PATH}
-    install_name_tool -change ${OLD_PATH} ${NEW_PATH} QtWebEngineProcess
-done
-popd
-
-# Final deployment to generate dmg (may take longer than 10' without output)
-macdeployqt GoldenCheetah.app -verbose=2 -fs=hfs+ -dmg
+# Deployment using macdeployqt
+macdeployqt GoldenCheetah.app -verbose=2 -executable=GoldenCheetah.app/Contents/MacOS/GoldenCheetah -fs=hfs+ -dmg
 
 echo "Renaming dmg file to branch and build number ready for deploy"
 mv GoldenCheetah.dmg ../GoldenCheetah_v3.7_x64.dmg

appveyor/macos/before_build.sh

@@ -54,10 +54,9 @@ sed -i "" "s|#\(HTPATH = ../httpserver.*\)|\1 |" src/gcconfig.pri
 # Robot
 sed -i "" "s|#\(DEFINES += GC_WANT_ROBOT.*\)|\1 |" src/gcconfig.pri
 
-# VLC & VIDEO
-sed -i "" "s|#\(VLC_INSTALL =.*\)|\1 ../VLC|" src/gcconfig.pri
+# Qt6 VIDEO
 sed -i "" "s|\(DEFINES += GC_VIDEO_NONE.*\)|#\1 |" src/gcconfig.pri
-sed -i "" "s|#\(DEFINES += GC_VIDEO_VLC.*\)|\1 |" src/gcconfig.pri
+sed -i "" "s|#\(DEFINES += GC_VIDEO_QT6.*\)|\1 |" src/gcconfig.pri
 
 # Enable R embedding
 sed -i "" "s|#\(DEFINES += GC_WANT_R.*\)|\1 |" src/gcconfig.pri

appveyor/macos/install.sh

@@ -41,18 +41,6 @@ if [ -z "$(ls -A D2XX)" ]; then
 fi
 sudo cp D2XX/libftd2xx.1.4.24.dylib /usr/local/lib
 
-# VLC
-if [[ -z "$(ls -A VLC)" ]]; then
-    mkdir -p VLC
-    curl -O http://download.videolan.org/pub/videolan/vlc/3.0.8/macosx/vlc-3.0.8.dmg
-    hdiutil mount vlc-3.0.8.dmg
-    cp -R "/Volumes/VLC media player/VLC.app/Contents/MacOS/include" VLC/include
-    cp -R "/Volumes/VLC media player/VLC.app/Contents/MacOS/lib" VLC/lib
-    cp -R "/Volumes/VLC media player/VLC.app/Contents/MacOS/plugins" VLC/plugins
-    rm -f VLC/plugins/plugins.dat
-fi
-sudo cp VLC/lib/libvlc*.dylib /usr/local/lib
-
 # Python 3.7.8
 curl -O https://www.python.org/ftp/python/3.7.9/python-3.7.9-macosx10.9.pkg
 sudo installer -pkg python-3.7.9-macosx10.9.pkg -target /