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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=959bc4cf9a3da9dbcc9155fd72fbd5f189869025
Submitter: Graham Bloice (graham.bloice@xxxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

959bc4c by Роман Донченко (dpb@xxxxxxxxxxxxxx):

    Fix the build when a different version of Qt is in PATH
    
    When we add our Qt to PATH, prepend it so that it will be found first.
    
    Change-Id: I405496d6a08d676b5a2e0d9bd792de7ba9abe7f9
    Reviewed-on: https://code.wireshark.org/review/18988
    Petri-Dish: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    (cherry picked from commit 4ace7ce80dc11010f78202ab742f749f85cbdd6b)
    Reviewed-on: https://code.wireshark.org/review/20809
    

Actions performed:

    from  6a05b59   Qt: do not expand collapsed trees when switching packets
    adds  959bc4c   Fix the build when a different version of Qt is in PATH


Summary of changes:
 CMakeLists.txt                |    2 +-
 packaging/nsis/CMakeLists.txt |    2 +-
 packaging/wix/CMakeLists.txt  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)