Wireshark-commits: [Wireshark-commits] master d142e7f: Fix build for Qt 4.8
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 21 Oct 2016 15:08:28 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d142e7f4038f840ec2d7d89a1de4d486e1f54222
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

d142e7f by Michal Labedzki (michal.labedzki@xxxxxxxxx):

    Fix build for Qt 4.8
    
    setCurrentText is only available in Qt5, so select the item manually.
    https://doc.qt.io/qt-5/qcombobox.html#currentText-prop
    
    Fixes: v2.3.0rc0-1002-g1cd2255 ("Qt: convert UatDialog to model/view pattern, improve UX")
    Change-Id: I402e7d159d512e870849ee54d851276c4cc7cf34
    Reviewed-on: https://code.wireshark.org/review/18351
    Reviewed-by: Michal Labedzki <michal.labedzki@xxxxxxxxx>
    Petri-Dish: Michal Labedzki <michal.labedzki@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  991e074   Qt: fix weird tree expander that results in a crash
    adds  d142e7f   Fix build for Qt 4.8


Summary of changes:
 ui/qt/uat_delegate.cpp |    8 ++++++++
 ui/qt/uat_model.cpp    |   20 +++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)