mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-05 18:54:14 +02:00
macOS: fix macdeployqt call, it has no -extra-plugins option
The previous commit passed -extra-plugins to macdeployqt, which does not know it: it aborted with "Unknown argument" and deployed nothing, so the following steps failed on an empty Frameworks/ directory. Call macdeployqt without options and stop the script if it fails. The offscreen plugin is copied by the existing fallback block.
This commit is contained in:
@@ -149,12 +149,12 @@ if [ ! -d $BUNDLE ] ; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
macdeployqt $BUNDLE -extra-plugins=platforms/libqoffscreen.dylib
|
||||
macdeployqt $BUNDLE || { echo "ERROR: macdeployqt failed"; exit 1; }
|
||||
|
||||
### offscreen platform plugin (headless use, e.g. qet_mcp.py) ########
|
||||
# macdeployqt only deploys libqcocoa. Without libqoffscreen, running
|
||||
# QT_QPA_PLATFORM=offscreen aborts. If -extra-plugins above did not
|
||||
# deploy it, copy it from the Homebrew Qt and make it point to the
|
||||
# QT_QPA_PLATFORM=offscreen aborts. macdeployqt has no option to add it,
|
||||
# so copy it from the Homebrew Qt and make it point to the
|
||||
# frameworks of the bundle. It is signed with the other plugins below.
|
||||
OFFSCREEN="$BUNDLE/Contents/PlugIns/platforms/libqoffscreen.dylib"
|
||||
if [ ! -f "$OFFSCREEN" ] ; then
|
||||
|
||||
Reference in New Issue
Block a user