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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e3c263c01236e7c31ec23f6c3d8750d7e92fb5a3
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

e3c263c by Gerald Combs (gerald@xxxxxxxxxxxxx):

    NSIS, WiX: Handle the presence or absence of mmdbresolve.
    
    Only install mmdbresolve if MAXMINDDB_FOUND is true.
    
    Fixup the Qt about box and WiX GTK defines while we're here.
    
    Change-Id: I7ac3c21ddb4aebc1dae1c3d8cfd2bcafc4139d2e
    Reviewed-on: https://code.wireshark.org/review/26299
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  f0fb6ee   mmdbresolve: Process our command line arguments by hand.
    adds  e3c263c   NSIS, WiX: Handle the presence or absence of mmdbresolve.


Summary of changes:
 packaging/nsis/config.nsh.in          |  4 ++--
 packaging/nsis/uninstall.nsi          |  5 ++++-
 packaging/nsis/wireshark.nsi          |  2 ++
 packaging/wix/CMakeLists.txt          | 13 +++++++++----
 packaging/wix/ComponentGroups.wxi     |  4 +++-
 packaging/wix/Features.wxi            |  2 ++
 packaging/wix/WiresharkOptionsDlg.wxs |  2 ++
 ui/qt/about_dialog.cpp                | 16 +++++++---------
 8 files changed, 31 insertions(+), 17 deletions(-)