diff options
author | Gerald Combs <gerald@wireshark.org> | 2013-07-25 23:49:47 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2013-07-25 23:49:47 +0000 |
commit | a05f55bffc2bc7d52d3f35370a7ae1eea2b75839 (patch) | |
tree | 94644ff0a3cc6cf339a165087ddbfb0c1e553760 /ui/qt/Makefile.common | |
parent | 7d73903af6209ef1b013c6ed61c866291bfb3785 (diff) |
Add a UAT dialog. Make UAT preferences uat_t * instead of void *.
C++-ize the UAT headers.
Add an ElidedLabel widget. Use it in the File Set, Profile, and UAT
dialogs.
Update the Qt README.
svn path=/trunk/; revision=50896
Diffstat (limited to 'ui/qt/Makefile.common')
-rw-r--r-- | ui/qt/Makefile.common | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common index 6a2f37f7ae..02d93e34ea 100644 --- a/ui/qt/Makefile.common +++ b/ui/qt/Makefile.common @@ -52,7 +52,8 @@ NODIST_GENERATED_HEADER_FILES = \ ui_search_frame.h \ ui_summary_dialog.h \ ui_splash_overlay.h \ - ui_time_shift_dialog.h + ui_time_shift_dialog.h \ + ui_uat_dialog.h # Generated C source files that we want in the distribution. GENERATED_C_FILES = @@ -99,6 +100,7 @@ MOC_HDRS = \ column_preferences_frame.h \ display_filter_combo.h \ display_filter_edit.h \ + elided_label.h \ export_dissection_dialog.h \ export_object_dialog.h \ file_set_dialog.h \ @@ -132,6 +134,7 @@ MOC_HDRS = \ splash_overlay.h \ syntax_line_edit.h \ time_shift_dialog.h \ + uat_dialog.h \ wireshark_application.h @@ -160,7 +163,8 @@ UI_FILES = \ search_frame.ui \ summary_dialog.ui \ splash_overlay.ui \ - time_shift_dialog.ui + time_shift_dialog.ui \ + uat_dialog.ui # # The .moc.cpp files generated from them. @@ -218,6 +222,7 @@ WIRESHARK_QT_SRC = \ column_preferences_frame.cpp \ display_filter_combo.cpp \ display_filter_edit.cpp \ + elided_label.cpp \ export_dissection_dialog.cpp \ export_object_dialog.cpp \ file_set_dialog.cpp \ @@ -255,6 +260,7 @@ WIRESHARK_QT_SRC = \ splash_overlay.cpp \ syntax_line_edit.cpp \ time_shift_dialog.cpp \ + uat_dialog.cpp \ wireshark_application.cpp noinst_HEADERS = \ |