diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-12 10:15:09 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-10-12 17:33:31 +0000 |
| commit | fe3e0df1607afbe61e675a3f08619e4460a6b753 (patch) | |
| tree | 41854449768cdda9960f3d0616aa0d3f1b2da5bc /ui | |
| parent | c5a056832dc9e3afaeb89beb6feedf134287183c (diff) | |
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@wireshark.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/rtp_player_dialog.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp index 9e0977820e..6a46d4b240 100644 --- a/ui/qt/rtp_player_dialog.cpp +++ b/ui/qt/rtp_player_dialog.cpp @@ -42,12 +42,10 @@ Q_DECLARE_METATYPE(RtpAudioStream *) Q_DECLARE_METATYPE(QCPGraph *) -#else // QT_MULTIMEDIA_LIB +#endif // QT_MULTIMEDIA_LIB #include <QPushButton> -#endif // QT_MULTIMEDIA_LIB - #include "stock_icon.h" #include "wireshark_application.h" |