From 160f84e7a84c2106361bad5f855adc81b181e971 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Mon, 8 Jun 2020 21:01:20 +0200
Subject: [PATCH] fix Windows installer: fix Qt dlls missing

---
 ChangeLog             |  4 ---
 windows/installer.nsi | 59 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 630a4990..66c53151 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,10 +26,6 @@
   by OS level Nap, Sleep, and Thread Priority systems, coded by AronVietti (#23)
 
 
-TODO fix Windows installer: fix check for app run, fix Qt dlls missing
-
-
-
 
 
 
diff --git a/windows/installer.nsi b/windows/installer.nsi
index 53b19fb3..326f5bba 100755
--- a/windows/installer.nsi
+++ b/windows/installer.nsi
@@ -57,19 +57,15 @@ Section
   File             "$%QTDIR64%\bin\Qt5Gui.dll"
   File             "$%QTDIR64%\bin\Qt5Widgets.dll"
   File             "$%QTDIR64%\bin\Qt5Network.dll"
+  File             "$%QTDIR64%\bin\Qt5Svg.dll"
   File             "$%QTDIR64%\bin\Qt5Xml.dll"
-  File             "$%QTDIR64%\bin\D3DCompiler_47.dll"
-  File             "$%QTDIR64%\bin\libEGL.dll"
-  File             "$%QTDIR64%\bin\libGLESv2.dll"
   ${Else}
   File             "$%QTDIR32%\bin\Qt5Core.dll"
   File             "$%QTDIR32%\bin\Qt5Gui.dll"
   File             "$%QTDIR32%\bin\Qt5Widgets.dll"
   File             "$%QTDIR32%\bin\Qt5Network.dll"
+  File             "$%QTDIR32%\bin\Qt5Svg.dll"
   File             "$%QTDIR32%\bin\Qt5Xml.dll"
-  File             "$%QTDIR32%\bin\D3DCompiler_47.dll"
-  File             "$%QTDIR32%\bin\libEGL.dll"
-  File             "$%QTDIR32%\bin\libGLESv2.dll"
   ${EndIf}
 
   ; other files
@@ -106,10 +102,40 @@ Section
   SetOutPath       $INSTDIR\platforms
   ${If} ${RunningX64}
   File             "$%QTDIR64%\plugins\platforms\qwindows.dll"
-  File             "$%QTDIR64%\plugins\platforms\qminimal.dll"  
   ${Else}
   File             "$%QTDIR32%\plugins\platforms\qwindows.dll"
-  File             "$%QTDIR32%\plugins\platforms\qminimal.dll"  
+  ${EndIf}
+
+  ; additional styles dlls
+  SetOutPath       $INSTDIR\styles
+  ${If} ${RunningX64}
+  File             "$%QTDIR64%\plugins\styles\qwindowsvistastyle.dll"
+  ${Else}
+  File             "$%QTDIR32%\plugins\styles\qwindowsvistastyle.dll"
+  ${EndIf}
+
+  ; additional imageformats dlls
+  SetOutPath       $INSTDIR\imageformats
+  ${If} ${RunningX64}
+  File             "$%QTDIR64%\plugins\imageformats\qgif.dll"
+  File             "$%QTDIR64%\plugins\imageformats\qicns.dll"
+  File             "$%QTDIR64%\plugins\imageformats\qico.dll"
+  File             "$%QTDIR64%\plugins\imageformats\qjpeg.dll"
+  File             "$%QTDIR64%\plugins\imageformats\qsvg.dll"
+  File             "$%QTDIR64%\plugins\imageformats\qtga.dll"
+  File             "$%QTDIR64%\plugins\imageformats\qtiff.dll"
+  File             "$%QTDIR64%\plugins\imageformats\qwbmp.dll"
+  File             "$%QTDIR64%\plugins\imageformats\qwebp.dll"
+  ${Else}
+  File             "$%QTDIR32%\plugins\imageformats\qgif.dll"
+  File             "$%QTDIR32%\plugins\imageformats\qicns.dll"
+  File             "$%QTDIR32%\plugins\imageformats\qico.dll"
+  File             "$%QTDIR32%\plugins\imageformats\qjpeg.dll"
+  File             "$%QTDIR32%\plugins\imageformats\qsvg.dll"
+  File             "$%QTDIR32%\plugins\imageformats\qtga.dll"
+  File             "$%QTDIR32%\plugins\imageformats\qtiff.dll"
+  File             "$%QTDIR32%\plugins\imageformats\qwbmp.dll"
+  File             "$%QTDIR32%\plugins\imageformats\qwebp.dll"
   ${EndIf}
 
 SectionEnd
@@ -134,14 +160,23 @@ Delete $INSTDIR\Qt5Core.dll
 Delete $INSTDIR\Qt5Gui.dll
 Delete $INSTDIR\Qt5Widgets.dll
 Delete $INSTDIR\Qt5Network.dll
+Delete $INSTDIR\Qt5Svg.dll
 Delete $INSTDIR\Qt5Xml.dll
-Delete $INSTDIR\D3DCompiler_47.dll
-Delete $INSTDIR\libEGL.dll
-Delete $INSTDIR\libGLESv2.dll
 Delete $INSTDIR\COPYING
 Delete $INSTDIR\platforms\qwindows.dll
-Delete $INSTDIR\platforms\qminimal.dll
 RMDir  $INSTDIR\platforms
+Delete $INSTDIR\styles\qwindowsvistastyle.dll
+RMDir  $INSTDIR\styles
+Delete $INSTDIR\imageformats\qgif.dll
+Delete $INSTDIR\imageformats\qicns.dll
+Delete $INSTDIR\imageformats\qico.dll
+Delete $INSTDIR\imageformats\qjpeg.dll
+Delete $INSTDIR\imageformats\qsvg.dll
+Delete $INSTDIR\imageformats\qtga.dll
+Delete $INSTDIR\imageformats\qtiff.dll
+Delete $INSTDIR\imageformats\qwbmp.dll
+Delete $INSTDIR\imageformats\qwebp.dll
+RMDir  $INSTDIR\imageformats
 RMDir  $INSTDIR
 
 SectionEnd