summaryrefslogtreecommitdiff
path: root/ui/qt
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-02-06 19:03:23 +0000
committerGerald Combs <gerald@wireshark.org>2013-02-06 19:03:23 +0000
commit248310e3a7e0087c90ca6360d2b3f4640fe0122b (patch)
tree389c653264bf72b8b458699150f332a24ca451ba /ui/qt
parent1c0deb0fc818252904878fe5419c75df3873a901 (diff)
downloadwireshark-248310e3a7e0087c90ca6360d2b3f4640fe0122b.tar.gz
Add filter expressions frame entries.
svn path=/trunk/; revision=47523
Diffstat (limited to 'ui/qt')
-rw-r--r--ui/qt/CMakeLists.txt3
-rw-r--r--ui/qt/Makefile.am2
-rw-r--r--ui/qt/Makefile.common4
3 files changed, 9 insertions, 0 deletions
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 13556e1f6a..340d9df26d 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -39,6 +39,7 @@ set(QTSHARK_H_SRC
export_dissection_dialog.h
export_object_dialog.h
file_set_dialog.h
+ filter_expressions_preferences_frame.h
font_color_preferences_frame.h
import_text_dialog.h
interface_tree.h
@@ -88,6 +89,7 @@ set(QTSHARK_CPP_SRC
export_dissection_dialog.cpp
export_object_dialog.cpp
file_set_dialog.cpp
+ filter_expressions_preferences_frame.cpp
font_color_preferences_frame.cpp
import_text_dialog.cpp
interface_tree.cpp
@@ -130,6 +132,7 @@ set(QTSHARK_UI
column_preferences_frame.ui
export_object_dialog.ui
file_set_dialog.ui
+ filter_expressions_preferences_frame.ui
font_color_preferences_frame.ui
import_text_dialog.ui
layout_preferences_frame.ui
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index 099b6d8c63..fdfd1b73d4 100644
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -106,6 +106,8 @@ export_object_dialog.cpp export_object_dialog.h: ui_export_object_dialog.h
file_set_dialog.cpp file_set_dialog.h: ui_file_set_dialog.h
+filter_expressions_preferences_frame.cpp filter_expressions_preferences_frame.h: ui_filter_expressions_preferences_frame.h
+
font_color_preferences_frame.cpp font_color_preferences_frame.h: ui_font_color_preferences_frame.h
import_text_dialog.cpp import_text_dialog.h: ui_import_text_dialog.h
diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common
index 40fbdb53d0..c237f7580e 100644
--- a/ui/qt/Makefile.common
+++ b/ui/qt/Makefile.common
@@ -36,6 +36,7 @@ GENERATED_NODIST_HEADER_FILES = \
ui_export_object_dialog.h \
ui_file_set_dialog.h \
ui_font_color_preferences_frame.h \
+ ui_filter_expressions_preferences_frame.h \
ui_import_text_dialog.h \
ui_layout_preferences_frame.h \
ui_main_welcome.h \
@@ -99,6 +100,7 @@ MOC_HDRS = \
export_dissection_dialog.h \
export_object_dialog.h \
file_set_dialog.h \
+ filter_expressions_preferences_frame.h \
font_color_preferences_frame.h \
import_text_dialog.h \
interface_tree.h \
@@ -136,6 +138,7 @@ UI_FILES = \
column_preferences_frame.ui \
export_object_dialog.ui \
file_set_dialog.ui \
+ filter_expressions_preferences_frame.ui \
font_color_preferences_frame.ui \
import_text_dialog.ui \
layout_preferences_frame.ui \
@@ -211,6 +214,7 @@ WIRESHARK_QT_SRC = \
export_dissection_dialog.cpp \
export_object_dialog.cpp \
file_set_dialog.cpp \
+ filter_expressions_preferences_frame.cpp \
font_color_preferences_frame.cpp \
import_text_dialog.cpp \
interface_tree.cpp \