Wireshark · Wireshark-commits: [Wireshark-commits] master d55e1b5: NSIS: Fix multiple issues.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d55e1b567554f2849db7d0b8030f68e529f5469d
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

d55e1b5 by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    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@xxxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  892703f   The heuristic for T.125 per is too week and we do not have a PER dissector for T.125 so remove the test. Remove unused hf entries. Fixes bug 10350.
    adds  d55e1b5   NSIS: Fix multiple issues.


Summary of changes:
 packaging/nsis/Makefile.nmake |    4 +-
 packaging/nsis/common.nsh     |   10 +--
 packaging/nsis/wireshark.nsi  |  180 +++++++++++++++++++----------------------
 3 files changed, 92 insertions(+), 102 deletions(-)