URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=304388a44f6fcb468f98f2c7179bb39cb4ecd294
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
304388a by Gerald Combs (gerald@xxxxxxxxxxxxx):
Install our Qt DLL directories recursively.
Qwindows.dll at least needs to be in the "platforms" subdirectory. Use a
PowerShell script to convert the output of windeployqt to its equivalent
NSIS instructions. Give the Qt DLL manifest a .nsh extension. Make sure
we uninstall known Qt DLL directories. DLLs now load correctly according
to Dependency Walker.
Install and uninstall our .qm files while we're here.
Change-Id: I06ed279809e6fce0e008c5f278a56b1ae34c8f21
Reviewed-on: https://code.wireshark.org/review/3267
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from 8d05e85 Fix the build: add a few more G_GINT64_MODIFIER's when printing 64-bit numbers.
adds 304388a Install our Qt DLL directories recursively.
Summary of changes:
.gitignore | 1 +
packaging/nsis/Makefile.nmake | 12 ++++------
packaging/nsis/uninstall.nsi | 34 ++++++++++++++++-----------
packaging/nsis/windeployqt-to-nsis.ps1 | 40 ++++++++++++++++++++++++++++++++
packaging/nsis/wireshark.nsi | 3 ++-
5 files changed, 68 insertions(+), 22 deletions(-)
create mode 100644 packaging/nsis/windeployqt-to-nsis.ps1