diff options
author | Tim Furlong <tim.furlong@gmail.com> | 2014-06-16 17:57:05 -0400 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2014-06-17 21:02:18 +0000 |
commit | 74fec385295d0594179833b62f5ee7ab31d4359c (patch) | |
tree | f067bea2b2de9a28a08e0b1cd5653accfb8468e8 /ui | |
parent | 417938310ad78de5f41f1f4108e62b50ed5b4dfa (diff) |
Get QtShark building on Win7 with Qt 5.3.0 using Qt Creator.
Several header file references in .ui files needed to be changed to not
be global, and the path to stats_tree_dialog.ui needed a "../qt" path
prepended to be found from the build...-Release directory.
Change-Id: I51c0bb15eed706f483085020ce2b3cea3c1cdc95
Reviewed-on: https://code.wireshark.org/review/2281
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/qt/capture_interfaces_dialog.ui | 2 | ||||
-rw-r--r-- | ui/qt/export_pdu_dialog.ui | 2 | ||||
-rw-r--r-- | ui/qt/lbm_lbtrm_transport_dialog.ui | 2 | ||||
-rw-r--r-- | ui/qt/lbm_lbtru_transport_dialog.ui | 2 | ||||
-rw-r--r-- | ui/qt/lbm_stream_dialog.ui | 2 | ||||
-rw-r--r-- | ui/qt/stats_tree_dialog.ui | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/ui/qt/capture_interfaces_dialog.ui b/ui/qt/capture_interfaces_dialog.ui index 96d48893a2..b92773ac23 100644 --- a/ui/qt/capture_interfaces_dialog.ui +++ b/ui/qt/capture_interfaces_dialog.ui @@ -633,7 +633,7 @@ <customwidget> <class>CaptureFilterCombo</class> <extends>QComboBox</extends> - <header location="global">capture_filter_combo.h</header> + <header>capture_filter_combo.h</header> </customwidget> </customwidgets> <resources/> diff --git a/ui/qt/export_pdu_dialog.ui b/ui/qt/export_pdu_dialog.ui index 57040ffd93..09e7dd5df6 100644 --- a/ui/qt/export_pdu_dialog.ui +++ b/ui/qt/export_pdu_dialog.ui @@ -66,7 +66,7 @@ <customwidget> <class>DisplayFilterEdit</class> <extends>QLineEdit</extends> - <header location="global">display_filter_edit.h</header> + <header>display_filter_edit.h</header> </customwidget> </customwidgets> <resources/> diff --git a/ui/qt/lbm_lbtrm_transport_dialog.ui b/ui/qt/lbm_lbtrm_transport_dialog.ui index c24057cf96..2c2e798a03 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.ui +++ b/ui/qt/lbm_lbtrm_transport_dialog.ui @@ -691,7 +691,7 @@ <customwidget> <class>DisplayFilterEdit</class> <extends>QLineEdit</extends> - <header location="global">display_filter_edit.h</header> + <header>display_filter_edit.h</header> </customwidget> </customwidgets> <resources/> diff --git a/ui/qt/lbm_lbtru_transport_dialog.ui b/ui/qt/lbm_lbtru_transport_dialog.ui index 3b2b271152..d254a4392a 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.ui +++ b/ui/qt/lbm_lbtru_transport_dialog.ui @@ -1123,7 +1123,7 @@ <customwidget> <class>DisplayFilterEdit</class> <extends>QLineEdit</extends> - <header location="global">display_filter_edit.h</header> + <header>display_filter_edit.h</header> </customwidget> </customwidgets> <resources/> diff --git a/ui/qt/lbm_stream_dialog.ui b/ui/qt/lbm_stream_dialog.ui index 2f7f16086d..18e5ed164d 100644 --- a/ui/qt/lbm_stream_dialog.ui +++ b/ui/qt/lbm_stream_dialog.ui @@ -118,7 +118,7 @@ <customwidget> <class>DisplayFilterEdit</class> <extends>QLineEdit</extends> - <header location="global">display_filter_edit.h</header> + <header>display_filter_edit.h</header> </customwidget> </customwidgets> <resources/> diff --git a/ui/qt/stats_tree_dialog.ui b/ui/qt/stats_tree_dialog.ui index 11be8132be..233af35e1f 100644 --- a/ui/qt/stats_tree_dialog.ui +++ b/ui/qt/stats_tree_dialog.ui @@ -85,7 +85,7 @@ <customwidget> <class>DisplayFilterEdit</class> <extends>QLineEdit</extends> - <header location="global">display_filter_edit.h</header> + <header>display_filter_edit.h</header> </customwidget> </customwidgets> <resources/> |