Wireshark-commits: [Wireshark-commits] master-2.0 f4949c5: RTP player: Always include QPushButton.
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: Mon, 12 Oct 2015 17:51:53 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f4949c5f6cdb74b2ccb7d741b1d6e1e2c7a2eebf
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

f4949c5 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    RTP player: Always include QPushButton.
    
    It looks like QPushButton gets included via ui_rtp_player_dialog.h in Qt
    5 but not in Qt 4. Make sure we include it explicitly whether or not
    QT_MULTIMEDIA_LIB is defined.
    
    Change-Id: I8203a1cc6f7b9beef0f749b93836a75885f85edd
    Reviewed-on: https://code.wireshark.org/review/10962
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit fe3e0df1607afbe61e675a3f08619e4460a6b753)
    Reviewed-on: https://code.wireshark.org/review/10963
    

Actions performed:

    from  70150c9   Try to fix wireless toolbar behavior on Linux.
    adds  f4949c5   RTP player: Always include QPushButton.


Summary of changes:
 ui/qt/rtp_player_dialog.cpp |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)