PICARD-2724: Move all Qt5 DLLs into main directory on Windows

Avoids import errors if a system wide, incompatible Qt5 installation is present on the system.
metabrainz · Sep 8, 2023 · addf1cf · addf1cf
1 parent b100eb1
commit addf1cf
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/scripts/package/win-common.ps1 b/scripts/package/win-common.ps1
@@ -36,4 +36,13 @@ Function FinalizePackage {
   CodeSignBinary (Join-Path $Path picard.exe)
   CodeSignBinary (Join-Path $Path fpcalc.exe)
   CodeSignBinary (Join-Path $Path discid.dll)
+
+  # Move all Qt5 DLLs into the main folder to avoid conflicts with system wide
+  # versions of those dependencies. Since some version PyInstaller tries to
+  # maintain the file hierarchy of imported modules, but this easily breaks
+  # DLL loading on Windows.
+  # Workaround for https://tickets.metabrainz.org/browse/PICARD-2736
+  $Qt5BinDir = (Join-Path $Path PyQt5 Qt5 bin)
+  Move-Item (Join-Path $Qt5BinDir *.dll) $Path -Force
+  Remove-Item $Qt5BinDir
 }