From cfbc37f695f04bf922da7a9da960c39e5265b0f4 Mon Sep 17 00:00:00 2001
From: Petr Bena <benapetr@gmail.com>
Date: Thu, 18 Jul 2024 21:12:55 +0200
Subject: [PATCH] qt6

---
 src/extensions/enwiki                    |  2 +-
 src/extensions/extension-flow            |  2 +-
 src/extensions/extension-mass-delete     |  2 +-
 src/extensions/extension-scoring         |  2 +-
 src/extensions/extension-splitter-helper |  2 +-
 src/extensions/extension-thanks          |  2 +-
 src/extensions/mass-delivery             |  2 +-
 windows/release.ps1                      | 17 ++++++++++++++++-
 8 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/extensions/enwiki b/src/extensions/enwiki
index b772daf89..7311760fe 160000
--- a/src/extensions/enwiki
+++ b/src/extensions/enwiki
@@ -1 +1 @@
-Subproject commit b772daf89b9c7d765aadc3206e9b121d116469b7
+Subproject commit 7311760fe2d77529a848dd3272c465f11266c5e1
diff --git a/src/extensions/extension-flow b/src/extensions/extension-flow
index e9ededda1..bcf5f4cfd 160000
--- a/src/extensions/extension-flow
+++ b/src/extensions/extension-flow
@@ -1 +1 @@
-Subproject commit e9ededda147a59256ba3f0e085fbe8b94aabbf51
+Subproject commit bcf5f4cfd582d94256012df1360d49e12f12094d
diff --git a/src/extensions/extension-mass-delete b/src/extensions/extension-mass-delete
index f421307b3..a3c1e17a1 160000
--- a/src/extensions/extension-mass-delete
+++ b/src/extensions/extension-mass-delete
@@ -1 +1 @@
-Subproject commit f421307b35bb58b49c5f7b38245936505fd516d9
+Subproject commit a3c1e17a1d455446ae0863dc37faa520546984e5
diff --git a/src/extensions/extension-scoring b/src/extensions/extension-scoring
index d953cf08d..99feb44ee 160000
--- a/src/extensions/extension-scoring
+++ b/src/extensions/extension-scoring
@@ -1 +1 @@
-Subproject commit d953cf08d62d32fac5aecb15faf1cc975d293da1
+Subproject commit 99feb44ee9d150deb0e990455195dd72f7250722
diff --git a/src/extensions/extension-splitter-helper b/src/extensions/extension-splitter-helper
index 557728a13..26d5f4bf6 160000
--- a/src/extensions/extension-splitter-helper
+++ b/src/extensions/extension-splitter-helper
@@ -1 +1 @@
-Subproject commit 557728a13b87d6d9d36a08411482a153ee1a726d
+Subproject commit 26d5f4bf6d899d92cbceb149164a9c30e0863419
diff --git a/src/extensions/extension-thanks b/src/extensions/extension-thanks
index ac7009205..e03dd82a5 160000
--- a/src/extensions/extension-thanks
+++ b/src/extensions/extension-thanks
@@ -1 +1 @@
-Subproject commit ac700920553ae8dc188eb9396cc4a23d070ba661
+Subproject commit e03dd82a5834bb9f45cc02b07f15e042b5a4779c
diff --git a/src/extensions/mass-delivery b/src/extensions/mass-delivery
index 7b936b3e5..fbdd09d00 160000
--- a/src/extensions/mass-delivery
+++ b/src/extensions/mass-delivery
@@ -1 +1 @@
-Subproject commit 7b936b3e557a152064e5b05b1418a132271485ac
+Subproject commit fbdd09d0029b076181059f8535c7cded1f1d7714
diff --git a/windows/release.ps1 b/windows/release.ps1
index e9fa9cacd..f55f6d1ad 100644
--- 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