From edb1d4c747fa2343f2a6230ebdd40e8267d25898 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sat, 12 Dec 2020 12:51:23 +0100
Subject: [PATCH] Append Qt5 to Windows setups

---
 dist/windows/strawberry.nsi.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dist/windows/strawberry.nsi.in b/dist/windows/strawberry.nsi.in
index 64ca2d4cf..b2d6b6310 100644
--- a/dist/windows/strawberry.nsi.in
+++ b/dist/windows/strawberry.nsi.in
@@ -98,13 +98,13 @@ Name "${PRODUCT_NAME}"
     !ifdef with_qt6
       OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt6-Debug-x86.exe"
     !else
-      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Debug-x86.exe"
+      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt5-Debug-x86.exe"
     !endif
   !else
     !ifdef with_qt6
       OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt6-x86.exe"
     !else
-      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-x86.exe"
+      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt5-x86.exe"
     !endif
   !endif
 !endif
@@ -114,13 +114,13 @@ Name "${PRODUCT_NAME}"
     !ifdef with_qt6
       OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt6-Debug-x64.exe"
     !else
-      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Debug-x64.exe"
+      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt5-Debug-x64.exe"
     !endif
   !else
     !ifdef with_qt6
       OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt6-x64.exe"
     !else
-      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-x64.exe"
+      OutFile "${PRODUCT_NAME_SHORT}Setup-${PRODUCT_DISPLAY_VERSION}-Qt5-x64.exe"
     !endif
   !endif
 !endif
@@ -267,7 +267,7 @@ Section "Strawberry" Strawberry
   File "Qt6Network.dll"
   File "Qt6Sql.dll"
   File "Qt6Widgets.dll"
-  File "Qt6WinExtras.dll"
+  ;File "Qt6WinExtras.dll"
   File "libqtsparkle-qt6.dll"
 !else
   File "Qt5Concurrent.dll"