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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e1e7dd0cfd505ac22a1f9ef8b42957c3d88df5fe
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

e1e7dd0 by Graham Bloice (graham.bloice@xxxxxxxxxxxxx):

    Fix the QT build on Qt 5.3 or later to use the windeployqt tool
    to copy the rquired Qt files into the runtime directory
    
    Qt 5.2 is broken as windeployqt doesn't take the required --release flag
    
    Also fix the passing of GCC_DLL and GPGERROR_DLL into config.pri so
    that the Qt build copies the required files instead of the entire
    gnutls bin dir twice (the variables expanded to nothing).
    
    Add support for autodetection of Qt 5.3.0 with msvc2013
    
    Change-Id: I1e9c70a5ff5d1fdfdce88ba15d324f1899c8129c
    Reviewed-on: https://code.wireshark.org/review/2734
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  b5e266f   Keep VS Code Analysis happy
    adds  e1e7dd0   Fix the QT build on Qt 5.3 or later to use the windeployqt tool to copy the rquired Qt files into the runtime directory


Summary of changes:
 Makefile.nmake    |   14 ++------------
 config.nmake      |    6 ++----
 ui/qt/QtShark.pro |   23 ++++++++++++++++-------
 3 files changed, 20 insertions(+), 23 deletions(-)