commit 063b7ff84954129d8488f24ef4e36f5acfddd09b
Author: Uwe Stöhr <[email protected]>
Date: Thu Jan 14 22:56:49 2016 +0100
Win installer: we need to ship the Qt platform dlls
- also remove now unnecessary file lists
diff --git a/development/Win32/packaging/installer/include/filelist.nsh
b/development/Win32/packaging/installer/include/filelist.nsh
index faafb63..d4be804 100644
--- a/development/Win32/packaging/installer/include/filelist.nsh
+++ b/development/Win32/packaging/installer/include/filelist.nsh
@@ -49,6 +49,14 @@ Lists of files to include in the installer
!macroend
+!macro FileListQtPlatforms COMMAND DIRECTORY
+
+ ${FILE}qminimal.dll"
+ ${FILE}qoffscreen.dll"
+ ${FILE}qwindows.dll"
+
+!macroend
+
!macro FileListMSVC COMMAND DIRECTORY
# Manifest not needed for 2010
@@ -57,15 +65,6 @@ Lists of files to include in the installer
!macroend
-!macro FileListDll COMMAND DIRECTORY
-
- ${FILE}iconv.dll"
- ${FILE}intl.dll"
- ${FILE}libhunspell.dll"
- ${FILE}zlibwapi.dll"
-
-!macroend
-
!macro FileListNetpbmBin COMMAND DIRECTORY
${FILE}libnetpbm10.dll"
@@ -108,13 +107,6 @@ Lists of files to include in the installer
!macroend
-!macro FileListPDFToolsBin COMMAND DIRECTORY
-
- ${FILE}pdfopen.exe"
- ${FILE}pdfclose.exe"
-
-!macroend
-
!macro FileListPDFViewBin COMMAND DIRECTORY
${FILE}pdfview.exe"
diff --git a/development/Win32/packaging/installer/setup/install.nsh
b/development/Win32/packaging/installer/setup/install.nsh
index d350c58..c8f58b0 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -47,20 +47,20 @@ Section -ProgramFiles SecProgramFiles
SetOutPath "$INSTDIR\bin"
!insertmacro FileListLyXBin File "${FILES_LYX}\bin\"
!insertmacro FileListQtBin File "${FILES_QT}\bin\"
- !insertmacro FileListDll File "${FILES_DEPS}\bin\"
!insertmacro FileListMSVC File "${FILES_MSVC}\"
!insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"
!insertmacro FileListDTLBin File "${FILES_DTL}\"
!insertmacro FileListRsvg File "${FILES_RSVG}\"
!insertmacro FileListDvipostBin File "${FILES_DVIPOST}\"
!insertmacro FileListPDFViewBin File "${FILES_PDFVIEW}\"
- !insertmacro FileListPDFToolsBin File "${FILES_PDFTOOLS}\"
# Qt plugin DLLs
SetOutPath "$INSTDIR\bin\imageformats"
!insertmacro FileListQtImageformats File "${FILES_QT}\plugins\imageformats\"
SetOutPath "$INSTDIR\bin\iconengines"
!insertmacro FileListQtIconengines File "${FILES_QT}\plugins\iconengines\"
+ SetOutPath "$INSTDIR\bin\platforms"
+ !insertmacro FileListQtPlatforms File "${FILES_QT}\plugins\platforms\"
# Resources
SetOutPath "$INSTDIR"
