diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-08-05 17:23:41 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-08-06 16:53:07 +0000 |
| commit | d55e1b567554f2849db7d0b8030f68e529f5469d (patch) | |
| tree | 551b851f673e961cfdd0d6db3ff934f4c752dffb /packaging/nsis/Makefile.nmake | |
| parent | 892703f9181fe98e87926c70b348b6df3e69c82e (diff) | |
NSIS: Fix multiple issues.
Restore the "!include qt-dll-manifest.nsh" clobbered by ga722f83 and
which resulted in missing DLL warnings (e.g. QT5PrintSupport.dll).
Fix overly aggressive search+replace in wireshark.nsi which broke the
WinPcap installation page and GTK+ selection. Try to finish the work on
promoting Qt started in ga722f83.
Bug: 10349
Change-Id: I7086be7c5272f4ae1b2cc26bbd5d5b725f013573
Reviewed-on: https://code.wireshark.org/review/3428
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'packaging/nsis/Makefile.nmake')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 95ee895636..9a35ae91f6 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -233,9 +233,9 @@ NSIS_FLAGS=\ wireshark.nsi: qt-dll-manifest.nsh qt-dll-manifest.nsh: windeployqt-to-nsis.ps1 !IF EXIST("$(QT5_BASE_DIR)\bin\windeployqt.exe") + set PATH=%PATH%;$(QT5_BASE_DIR)\bin powershell -executionpolicy bypass -File windeployqt-to-nsis.ps1 \ - "$(QT5_BASE_DIR)\bin\windeployqt.exe" \ - ..\..\wireshark-qt-release\qtshark.exe \ + windeployqt.exe ..\..\wireshark-qt-release\qtshark.exe \ > $@ !ELSE IF EXIST("..\..\wireshark-qt-release\Qt5Core.dll") type << > $@ |