From f1ae639729208b0c9e606b937d2ddc45310f3c3e Mon Sep 17 00:00:00 2001
From: Joe Garcia <joe.garcia@ssec.wisc.edu>
Date: Mon, 15 Mar 2021 21:27:01 -0500
Subject: [PATCH] add full version number to the framework path used by Qt5, so
less potential version collisions should we make a universal bundle
---
ShellB3/shallbethree.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh
index d159b861..a0fb7836 100755
--- a/ShellB3/shallbethree.sh
+++ b/ShellB3/shallbethree.sh
@@ -6589,6 +6589,7 @@ mk_qt5() {
fi
export EXTRAPARMS="${EXTRAPARMS} -no-openssl -securetransport"
export EXTRAPARMS="${EXTRAPARMS} -sdk macosx${MACOSX_DEPLOYMENT_TARGET} QMAKE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}"
+ export EXTRAPARMS="${EXTRAPARMS} QMAKE_FRAMEWORK_VERSION=$( python3 -c "import sys,os; print(os.environ['QT5USEVER'].split('-')[-1])" )" #this sets the framework internal version path
export EXTRAPARMS="${EXTRAPARMS} -R ${BASE}"
export EXTRAPARMS="${EXTRAPARMS} -skip qtwebengine"
if true ; then
--
GitLab