diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2017-05-31 21:34:55 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2017-06-01 07:27:05 +0000 |
| commit | dc7b9cdb41561d264647e73f4b0a05b8c48fb176 (patch) | |
| tree | f402385ac719cf1f7a3d5d446e41e2a410d3be13 /ui | |
| parent | 6607be77f30c8b08e2ffb8160d9f5211415decc6 (diff) | |
| download | wireshark-dc7b9cdb41561d264647e73f4b0a05b8c48fb176.tar.gz | |
Qt: Disable -Wframe-larger-than= for ui_main_window.h
The generated Ui_MainWindow::setupUi() can grow larger than our configured
limit, so turn off -Wframe-larger-than= for ui_main_window.h.
Change-Id: I550ff30ebe566b711c63f7a9d0276e5b06244407
Reviewed-on: https://code.wireshark.org/review/21866
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/main_window.cpp | 7 | ||||
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index b47b83e34c..d9036cb3e9 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -20,7 +20,14 @@ */ #include "main_window.h" + +/* + * The generated Ui_MainWindow::setupUi() can grow larger than our configured limit, + * so turn off -Wframe-larger-than= for ui_main_window.h. + */ +DIAG_OFF(frame-larger-than=) #include <ui_main_window.h> +DIAG_ON(frame-larger-than=) #include <epan/addr_resolv.h> #include "epan/dissector_filters.h" diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 4f550b3bbd..82f9cc7543 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -28,7 +28,14 @@ #endif #include "main_window.h" + +/* + * The generated Ui_MainWindow::setupUi() can grow larger than our configured limit, + * so turn off -Wframe-larger-than= for ui_main_window.h. + */ +DIAG_OFF(frame-larger-than=) #include <ui_main_window.h> +DIAG_ON(frame-larger-than=) #ifdef _WIN32 #include <windows.h> |