summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2022-04-07 14:34:51 +0200
committerEike Ziller <eike.ziller@qt.io>2022-04-08 14:18:17 +0000
commitd2e1590aec7b8d6d32ba2f77f6802b093ee7fbf2 (patch)
tree9dde4cd9a1811dc4128052d230bdbffa4716bbc0 /scripts
parent81c1c63c1dac224bcc492b92958790884082e86b (diff)
downloadqt-creator-d2e1590aec7b8d6d32ba2f77f6802b093ee7fbf2.tar.gz
macOS: Do not deploy some plugins and their dependencies
macdeployqt deploys all plugins of a kind, like all tls or sql backends. We only want the securetransport and sqlite ones from these, and since Qt 6.3 now also builds the openssl backend, and the postgres backend has a dependency on openssl that gets shipped, we end up with issues (openssl backend being loaded which finds and loads openssl from postgres). So clean these things up after macdeployqt. Change-Id: Iccbe4c422a4cce3fd4da0af5f6e2595f85848ece Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/deployqtHelper_mac.sh16
1 files changed, 16 insertions, 0 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh
index 8c380bc2a8..e85c48ef20 100755
--- a/scripts/deployqtHelper_mac.sh
+++ b/scripts/deployqtHelper_mac.sh
@@ -174,3 +174,19 @@ if [ ! -d "$app_path/Contents/Frameworks/QtCore.framework" ]; then
"$clangbackendArgument" || exit 1
fi
+
+# clean up after macdeployqt
+# it deploys some plugins (and libs for these) that interfere with what we want
+echo "Cleaning up after macdeployqt..."
+toRemove=(\
+ "Contents/PlugIns/tls/libqopensslbackend.dylib" \
+ "Contents/PlugIns/sqldrivers/libqsqlpsql.dylib" \
+ "Contents/PlugIns/sqldrivers/libqsqlodbc.dylib" \
+ "Contents/Frameworks/libpq.*dylib" \
+ "Contents/Frameworks/libssl.*dylib" \
+ "Contents/Frameworks/libcrypto.*dylib" \
+)
+for f in "${toRemove[@]}"; do
+ echo "- removing \"$app_path/$f\""
+ rm "$app_path"/$f 2> /dev/null; done
+exit 0