forked from pool/wireshark
Andreas Stieger
d83bdb3f10
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=251
59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
From b8e8aa87f43c12ad564426b3359f593305cd45a1 Mon Sep 17 00:00:00 2001
|
|
From: Roland Knall <rknall@gmail.com>
|
|
Date: Wed, 25 Apr 2018 10:28:30 +0200
|
|
Subject: [PATCH] Qt: Fix various missing header includes
|
|
References: https://bugzilla.opensuse.org/show_bug.cgi?id=1093733
|
|
|
|
Qt 5.11 seems to have changed the include dependencies, so adding those, that are missing
|
|
|
|
Change-Id: I2b0482f7554467d6981be65bfd3fea1a3e118976
|
|
Reviewed-on: https://code.wireshark.org/review/27145
|
|
Petri-Dish: Roland Knall <rknall@gmail.com>
|
|
Tested-by: Petri Dish Buildbot
|
|
Reviewed-by: Roland Knall <rknall@gmail.com>
|
|
---
|
|
ui/qt/packet_format_group_box.cpp | 1 +
|
|
ui/qt/time_shift_dialog.cpp | 1 +
|
|
ui/qt/wireless_frame.cpp | 1 +
|
|
3 files changed, 3 insertions(+)
|
|
|
|
diff --git a/ui/qt/packet_format_group_box.cpp b/ui/qt/packet_format_group_box.cpp
|
|
index a80a71aaad..3c0fff28aa 100644
|
|
--- a/ui/qt/packet_format_group_box.cpp
|
|
+++ b/ui/qt/packet_format_group_box.cpp
|
|
@@ -10,6 +10,7 @@
|
|
#include <ui_packet_format_group_box.h>
|
|
|
|
#include <QStyle>
|
|
+#include <QStyleOption>
|
|
|
|
PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) :
|
|
QGroupBox(parent),
|
|
diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp
|
|
index 93882c09a3..8460db2e96 100644
|
|
--- a/ui/qt/time_shift_dialog.cpp
|
|
+++ b/ui/qt/time_shift_dialog.cpp
|
|
@@ -14,6 +14,7 @@
|
|
#include <ui/time_shift.h>
|
|
#include <ui/qt/utils/tango_colors.h>
|
|
|
|
+#include <QStyleOption>
|
|
|
|
TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) :
|
|
QDialog(parent),
|
|
diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp
|
|
index bd9076abcf..46fb2dd2f3 100644
|
|
--- a/ui/qt/wireless_frame.cpp
|
|
+++ b/ui/qt/wireless_frame.cpp
|
|
@@ -23,6 +23,7 @@
|
|
#include <wsutil/frequency-utils.h>
|
|
|
|
#include <QProcess>
|
|
+#include <QAbstractItemView>
|
|
|
|
// To do:
|
|
// - Disable or hide invalid channel types.
|
|
--
|
|
2.17.0
|
|
|