From 4bde597fc1cb0c99b5cbc753963f9d67ab32b6de Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Sun, 13 May 2012 18:40:47 +0200
Subject: [PATCH] Windows installer: Update code for QtPlugins

Now, the precompiled binaries from Nokia can be used.
---
 development/Win32/packaging/installer/include/filelist.nsh | 7 ++++++-
 development/Win32/packaging/installer/setup/install.nsh    | 1 +
 development/Win32/packaging/installer/setup/uninstall.nsh  | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh
index e5304545b6..6f64616037 100644
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -24,7 +24,12 @@ Lists of files to include in the installer
 !macro FileListQtBin COMMAND DIRECTORY
 
   ${FILE}QtCore4.dll"
-  ${FILE}QtGui4.dll"  
+  ${FILE}QtGui4.dll"
+
+!macroend
+
+!macro FileListQtPlugins COMMAND DIRECTORY
+
   ${FILE}qgif4.dll"
 
 !macroend
diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index ba74c113b9..bacfe1bf58 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -28,6 +28,7 @@ Section -ProgramFiles SecProgramFiles
   SetOutPath "$INSTDIR\bin"
   !insertmacro FileListLyXBin File "${FILES_LYX}\bin\"
   !insertmacro FileListQtBin File "${FILES_QT}\bin\"
+  !insertmacro FileListQtPlugins File "${FILES_QT}\plugins\imageformats\"
   !insertmacro FileListDll File "${FILES_DEPS}\bin\"
   !insertmacro FileListMSVC File "${FILES_MSVC}\"
   !insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"
diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh
index f079514359..be321ff5f1 100644
--- a/development/Win32/packaging/installer/setup/uninstall.nsh
+++ b/development/Win32/packaging/installer/setup/uninstall.nsh
@@ -13,6 +13,7 @@ Section "un.Program Files" un.SecProgramFiles
   # Binaries
   !insertmacro FileListLyXBin Delete "$INSTDIR\bin\"
   !insertmacro FileListQtBin Delete "$INSTDIR\bin\"
+  !insertmacro FileListQtPlugins Delete "$INSTDIR\bin\"
   !insertmacro FileListDll Delete "$INSTDIR\bin\"
   !insertmacro FileListMSVC Delete "$INSTDIR\bin\"
   !insertmacro FileListNetpbmBin Delete "$INSTDIR\bin\"