From f9c2b3aa79cff988b6b4e2aa6fcaedf376dc041b Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 8 Jan 2020 15:59:26 -0800 Subject: NSIS: Fix a dangling output path. The updates to windeployqt-to-nsis.ps1 g7a09c78f12 added SetOutPath calls to qt-dll-manifest.nsh. This means we need to reset the output path before adding our translation files. Change-Id: I4b4ede72efa67cc4617aaae5baf8d38df6952df7 Reviewed-on: https://code.wireshark.org/review/35705 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- packaging/nsis/wireshark.nsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index c29282dbd5..816ba067c8 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -946,7 +946,9 @@ File "${QT_DIR}\${PROGRAM_NAME_PATH}" WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${PROGRAM_NAME_PATH}" "" '$INSTDIR\${PROGRAM_NAME_PATH}' WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${PROGRAM_NAME_PATH}" "Path" '$INSTDIR' !include qt-dll-manifest.nsh + ${!defineifexist} TRANSLATIONS_FOLDER "${QT_DIR}\translations" +SetOutPath $INSTDIR !ifdef TRANSLATIONS_FOLDER ; Starting from Qt 5.5, *.qm files are put in a translations subfolder File /r "${QT_DIR}\translations" -- cgit v1.2.3