Skip to content

Commit

Permalink
Remove unneeded plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
jdpurcell committed Dec 4, 2024
1 parent e9d8583 commit 6b46f4b
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
8 changes: 8 additions & 0 deletions dist/scripts/macdeploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ if [[ (-f "$IMF_DIR/kimg_heif.dylib" || -f "$IMF_DIR/kimg_heif.so") && -f "$IMF_
echo "Removing duplicate HEIF plugin"
rm "$IMF_DIR/libqmacheif.dylib"
fi
if [[ (-f "$IMF_DIR/kimg_tga.dylib" || -f "$IMF_DIR/kimg_tga.so") && -f "$IMF_DIR/libqtga.dylib" ]]; then
# Prefer kimageformats TGA plugin which supports more formats
echo "Removing duplicate TGA plugin"
rm "$IMF_DIR/libqtga.dylib"
fi

# OpenSSL isn't needed since we use platform-native TLS
rm -f qView.app/Contents/PlugIns/tls/libqopensslbackend.dylib

echo "Running codesign"
if [[ "$APPLE_NOTARIZE_REQUESTED" == "true" ]]; then
Expand Down
7 changes: 7 additions & 0 deletions dist/scripts/windeployqt.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ if ($qtVersion -ge [version]'6.8.1') {
Copy-Item -Path "dist\win\fonts\Segoe Fluent Icons.ttf" -Destination "bin\fonts"
}

$imfDir = "bin\imageformats"
if ((Test-Path "$imfDir\kimg_tga.dll") -and (Test-Path "$imfDir\qtga.dll")) {
# Prefer kimageformats TGA plugin which supports more formats
Write-Output "Removing duplicate TGA plugin"
Remove-Item "$imfDir\qtga.dll"
}

if ($NightlyVersion -eq '') {
# Call innomake if we are not building a nightly version (no version passed)
& "dist/scripts/innomake.ps1"
Expand Down

0 comments on commit 6b46f4b

Please sign in to comment.