From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Thu, 26 Nov 2015 00:11:26 +0000 (+0100)
Subject: installer: include DLLs for SVG
X-Git-Tag: 2.2.0alpha2~21
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=14538a3186f3acbeb3b256cc5e1d44664c476342;p=features.git

installer: include DLLs for SVG

It seems that the QT file qsvgicon4.dll is needed for svg icons in lyX. QtXml might be necessary as well
---

diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh
index d657ea10d8..5d1bbc303a 100644
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -20,6 +20,7 @@ Lists of files to include in the installer
   ${FILE}QtCore4.dll"
   ${FILE}QtGui4.dll"
   ${FILE}QtSvg4.dll"
+  ${FILE}QtXml4.dll"
 
 !macroend
 
@@ -35,6 +36,12 @@ Lists of files to include in the installer
 
 !macroend
 
+!macro FileListQtIconengines COMMAND DIRECTORY
+
+  ${FILE}qsvgicon4.dll"
+
+!macroend
+
 !macro FileListMSVC COMMAND DIRECTORY
 
   # Manifest not needed for 2010
diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index 3ebfddaf1b..2ebe6415a8 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -48,6 +48,7 @@ Section -ProgramFiles SecProgramFiles
   !insertmacro FileListLyXBin File "${FILES_LYX}\bin\"
   !insertmacro FileListQtBin File "${FILES_QT}\bin\"
   !insertmacro FileListQtImageformats File "${FILES_QT}\plugins\imageformats\"
+  !insertmacro FileListQtIconengines File "${FILES_QT}\plugins\iconengines\"
   !insertmacro FileListDll File "${FILES_DEPS}\bin\"
   !insertmacro FileListMSVC File "${FILES_MSVC}\"
   !insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"