diff options
| author | Gerald Combs <gerald@wireshark.org> | 2020-01-08 15:59:26 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2020-01-09 00:35:53 +0000 |
| commit | f9c2b3aa79cff988b6b4e2aa6fcaedf376dc041b (patch) | |
| tree | fe567f16b8192647f140be3f604f52f243734253 /packaging/nsis | |
| parent | b553066a331f7f45447962f5cc32161db44308ea (diff) | |
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 <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 |
1 files changed, 2 insertions, 0 deletions
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" |