From 5ef2e88f00ade7e6569fc232e8f35cb3d319621e Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Thu, 5 Jan 2017 21:32:52 +0100 Subject: [PATCH] NSIS: Adjust to 5.6.2 image --- cmake/modules/NSIS.template.in | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 19a0cc305..d28c90639 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -418,10 +418,8 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION File "${QT_DLL_PATH}\Qt5Core.dll" File "${QT_DLL_PATH}\Qt5Gui.dll" File "${QT_DLL_PATH}\Qt5Network.dll" - File "${QT_DLL_PATH}\Qt5OpenGL.dll" File "${QT_DLL_PATH}\Qt5PrintSupport.dll" File "${QT_DLL_PATH}\Qt5Qml.dll" - File "${QT_DLL_PATH}\Qt5Quick.dll" File "${QT_DLL_PATH}\Qt5Sql.dll" File "${QT_DLL_PATH}\Qt5WebKit.dll" File "${QT_DLL_PATH}\Qt5WebKitWidgets.dll" @@ -435,9 +433,9 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION ;Qt deps File "${MING_BIN}\libpng16-16.dll" - File "${MING_BIN}\icudata53.dll" - File "${MING_BIN}\icui18n53.dll" - File "${MING_BIN}\icuuc53.dll" + File "${MING_BIN}\icudata56.dll" + File "${MING_BIN}\icui18n56.dll" + File "${MING_BIN}\icuuc56.dll" File "${MING_BIN}\libEGL.dll" File "${MING_BIN}\libGLESv2.dll" File "${MING_BIN}\libjpeg-8.dll" @@ -446,11 +444,14 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION File "${MING_BIN}\libcrypto-10.dll" File "${MING_BIN}\libssl-10.dll" File "${MING_BIN}\libstdc++-6.dll" - File "${MING_BIN}\libwebp-4.dll" + File "${MING_BIN}\libwebp-5.dll" File "${MING_BIN}\libxslt-1.dll" File "${MING_BIN}\libxml2-2.dll" File "${MING_BIN}\zlib1.dll" - File "${MING_BIN}\libsqlite3-0.dll" + File "${MING_BIN}\libharfbuzz-0.dll" + File "${MING_BIN}\libfreetype-6.dll" + File "${MING_BIN}\libglib-2.0-0.dll" + File "${MING_BIN}\libintl-8.dll" ;QtKeyChain stuff File "${MING_BIN}\libqt5keychain.dll"