diff --git a/dist/scripts/macdeploy.sh b/dist/scripts/macdeploy.sh index df5ba411..7e884a97 100755 --- a/dist/scripts/macdeploy.sh +++ b/dist/scripts/macdeploy.sh @@ -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 diff --git a/dist/scripts/windeployqt.ps1 b/dist/scripts/windeployqt.ps1 index e5f21f5e..2de273f6 100755 --- a/dist/scripts/windeployqt.ps1 +++ b/dist/scripts/windeployqt.ps1 @@ -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"