Wireshark-commits: [Wireshark-commits] master 8d927a9: Qt: Fix QStyledItemDelegate assertions.
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, 2 Dec 2016 03:34:42 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8d927a98fdac92b562cfd5c769f7ae7bed0ace2d
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

8d927a9 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Qt: Fix QStyledItemDelegate assertions.
    
    QStyledItemDelegate::paint asserts if you pass it an empty QModelIndex.
    We were doing this in PercentBarDelegate and TimelineDelegate in order to
    keep it from drawing any text. Return an empty string from ::displayText
    instead, which appears to be the correct way to paint without text.
    
    Bug: 13180
    Change-Id: I8064d9575e04e95a926797eec7f6ad2b0bfef1c0
    Reviewed-on: https://code.wireshark.org/review/19007
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  672a5bd   The Kerberos dissector include Kerberos header, and needs KRB5_CFLAGS.
    adds  8d927a9   Qt: Fix QStyledItemDelegate assertions.


Summary of changes:
 ui/qt/percent_bar_delegate.cpp |    2 +-
 ui/qt/percent_bar_delegate.h   |    4 ++++
 ui/qt/timeline_delegate.cpp    |    3 +--
 ui/qt/timeline_delegate.h      |    4 ++++
 4 files changed, 10 insertions(+), 3 deletions(-)