From e1db9c832f6b13a8aa0f5fdf8fdf72f32c55fc77 Mon Sep 17 00:00:00 2001
From: Alejandro Martinez <amtriathlon@gmail.com>
Date: Thu, 30 Apr 2020 16:20:55 -0300
Subject: [PATCH] Fix Travis-ci builds for macOS - Add QWebEngine dependence
 [skip appveyor] QWebEngine depends on QtQmlModels and QtQml in Qt5.14.2

---
 travis/osx/after_success.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/travis/osx/after_success.sh b/travis/osx/after_success.sh
index 0f9be19cb..355b0a0d0 100755
--- a/travis/osx/after_success.sh
+++ b/travis/osx/after_success.sh
@@ -14,20 +14,24 @@ cp /usr/local/opt/icu4c/lib/libicudata.*.dylib GoldenCheetah.app/Contents/Framew
 cp -R /usr/local/opt/python/Frameworks/Python.framework GoldenCheetah.app/Contents/Frameworks
 install_name_tool -change `otool -L GoldenCheetah.app/Contents/MacOS/GoldenCheetah | awk '/python/ {print $1; gsub("/usr/local/opt/python", "@executable_path/..", $1); print $1}'` GoldenCheetah.app/Contents/MacOS/GoldenCheetah
 
-# Fix QtWebEngineProcess due to bug in macdployqt from homebrew
+# Initial deployment using macdeployqt
 /usr/local/opt/qt5/bin/macdeployqt GoldenCheetah.app -verbose=2 -executable=GoldenCheetah.app/Contents/MacOS/GoldenCheetah
+
+# Fix QtWebEngineProcess due to bug in macdployqt from homebrew
 pushd GoldenCheetah.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS
-for LIB in QtGui QtCore QtWebEngineCore QtQuick QtWebChannel QtNetwork QtPositioning
+for LIB in QtGui QtCore QtWebEngineCore QtQuick QtWebChannel QtNetwork QtPositioning QtQmlModels QtQml
 do
-    OLD_PATH=`otool -L QtWebEngineProcess | grep ${LIB} | cut -f 1 -d ' '`
+    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
 
-# Deploy and generate dmg
+# Final deployment to generate dmg
 /usr/local/opt/qt5/bin/macdeployqt GoldenCheetah.app -verbose=2 -fs=hfs+ -dmg
+
+# Fix remaining issues
 python ../travis/macdeployqtfix.py GoldenCheetah.app /usr/local/opt/qt5
 
 echo "Renaming dmg file to branch and build number ready for deploy"