osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Tim Furlong 2014-06-16 17:57:05 -04:00 committed by Evan Huus
parent 417938310a
commit 74fec38529
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/capture_interfaces_dialog.ui
View File

@ -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/>

2
ui/qt/export_pdu_dialog.ui
View File

@ -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/>

2
ui/qt/lbm_lbtrm_transport_dialog.ui
View File

@ -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/>

2
ui/qt/lbm_lbtru_transport_dialog.ui
View File

@ -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/>

2
ui/qt/lbm_stream_dialog.ui
View File

@ -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/>

2
ui/qt/stats_tree_dialog.ui
View File

@ -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/>