qt6

huggle · Jul 18, 2024 · cfbc37f · cfbc37f
1 parent 2ebbbf6
commit cfbc37f
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 8 deletions.
diff --git a/src/extensions/enwiki b/src/extensions/enwiki
diff --git a/src/extensions/extension-flow b/src/extensions/extension-flow
diff --git a/src/extensions/extension-mass-delete b/src/extensions/extension-mass-delete
diff --git a/src/extensions/extension-scoring b/src/extensions/extension-scoring
diff --git a/src/extensions/extension-splitter-helper b/src/extensions/extension-splitter-helper
diff --git a/src/extensions/extension-thanks b/src/extensions/extension-thanks
diff --git a/src/extensions/mass-delivery b/src/extensions/mass-delivery
diff --git a/windows/release.ps1 b/windows/release.ps1
@@ -205,7 +205,22 @@ cp ..\src\scripts\*.js release\extensions
 cp ..\src\huggle_res\Resources\huggle.ico huggle.ico
 cp ..\src\huggle_res\Resources\huggle.ico release
 # missing Qt dll, bug in winqtdeploy :/
-cp $qt_path\bin\Qt5Multimedia.dll release
+$path = Join-Path $qt_path 'bin'
+$fileQt5 = 'Qt5Multimedia.dll'
+$fileQt6 = 'Qt6Multimedia.dll'
+
+if (Test-Path (Join-Path $path $fileQt5))
+{
+    Copy-Item (Join-Path $path $fileQt5) 'release'
+}
+elseif (Test-Path (Join-Path $path $fileQt6))
+{
+    Copy-Item (Join-Path $path $fileQt6) 'release'
+}
+else
+{
+    Write-Error 'Neither Qt5Multimedia.dll nor Qt6Multimedia.dll was found.'
+}
 
 # Older SSL, used by Qt 5.10 and older
 #cp $openssl_path\libssl32.dll release