Wireshark-commits: [Wireshark-commits] master dff0382: Ensure that QT5_BASE_DIR is known by QtShark

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 29 Jul 2014 13:36:54 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=dff03823302e020bdfefbb1023c8297fa31d325d
Submitter: Graham Bloice (graham.bloice@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

dff0382 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    Ensure that QT5_BASE_DIR is known by QtShark.pro
    
    Otherwise the call to winqtdeploy will fail if it is not already in the PATH
    
    Change-Id: I74db604a6fd45204bda8d6ac9d9c98c0c12598ec
    Reviewed-on: https://code.wireshark.org/review/3218
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Tested-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Petri-Dish: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    

Actions performed:

    from  3b11d22   Remove duplicated entry for AVP 258 Auth-Application-Id from HP.xml it was overiding the correct one from dictionary.xml
    adds  dff0382   Ensure that QT5_BASE_DIR is known by QtShark.pro


Summary of changes:
 Makefile.nmake    |    1 +
 ui/qt/QtShark.pro |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)