From fe3e0df1607afbe61e675a3f08619e4460a6b753 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Mon, 12 Oct 2015 10:15:09 -0700
Subject: 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>
---
 ui/qt/rtp_player_dialog.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'ui/qt/rtp_player_dialog.cpp')

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"
 
-- 
cgit v1.2.1