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

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

Commits:

0b11d5d by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    Win32: fix generation of NSIS installer when compiling with Qt 5.5
    
    *.qm files are now in a translations subfolder
    
    Change-Id: I233152cd2662aec7072769e27f7a278c6890d8ec
    Reviewed-on: https://code.wireshark.org/review/9646
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  41ed712   Qt: Frame flag updates.
    adds  0b11d5d   Win32: fix generation of NSIS installer when compiling with Qt 5.5


Summary of changes:
 packaging/nsis/uninstall.nsi |    2 ++
 packaging/nsis/wireshark.nsi |   24 +++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)