From 74fec385295d0594179833b62f5ee7ab31d4359c Mon Sep 17 00:00:00 2001
From: Tim Furlong <tim.furlong@gmail.com>
Date: Mon, 16 Jun 2014 17:57:05 -0400
Subject: 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>
---
 ui/qt/capture_interfaces_dialog.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/qt/capture_interfaces_dialog.ui')

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/>
-- 
cgit v1.2.3