diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-02-18 04:06:13 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-02-18 12:55:26 +0000 |
| commit | b32a5ee98cd4c0e17b900c77b046f7977cbd12bb (patch) | |
| tree | 570a94b1eac6a16e37d71e97209337e1e9dbe3aa /ui/qt | |
| parent | 7b6e5264391521d1519d16ff148a7a62c370e5fd (diff) | |
Don't add the wiretap directory to the list of include directories.
If you include something from the wiretap directory, always precede it
with wiretap/.
Fix some includes of files in the top-level directory to use a path
relative to the current directory, not relative to the wiretap
directory.
This makes it a bit clearer what's being included.
Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54
Reviewed-on: https://code.wireshark.org/review/13990
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/Makefile.am | 2 | ||||
| -rw-r--r-- | ui/qt/Wireshark.pro | 2 | ||||
| -rw-r--r-- | ui/qt/about_dialog.cpp | 4 | ||||
| -rw-r--r-- | ui/qt/export_pdu_dialog.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index b8a0ecf7dc..f276a9663f 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -22,7 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -AM_CPPFLAGS += -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) +AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) noinst_LIBRARIES = libqtui.a diff --git a/ui/qt/Wireshark.pro b/ui/qt/Wireshark.pro index 68023b565c..cc6b97cb40 100644 --- a/ui/qt/Wireshark.pro +++ b/ui/qt/Wireshark.pro @@ -175,7 +175,7 @@ win32 { #tap_register.CONFIG += no_link QMAKE_EXTRA_COMPILERS += tap_register -INCLUDEPATH += ../.. ../../wiretap +INCLUDEPATH += ../.. win32:INCLUDEPATH += \ $${WIRESHARK_LIB_DIR}/gtk2/include/glib-2.0 $${WIRESHARK_LIB_DIR}/gtk2/lib/glib-2.0/include \ $${WIRESHARK_LIB_DIR}/gtk3/include/glib-2.0 $${WIRESHARK_LIB_DIR}/gtk3/lib/glib-2.0/include \ diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 19510ce16c..5e9258b9df 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -37,8 +37,8 @@ #include <epan/wslua/init_wslua.h> #endif -#include "../log.h" -#include "../register.h" +#include "../../log.h" +#include "../../register.h" #include "ui/alert_box.h" #include "ui/last_open_dir.h" diff --git a/ui/qt/export_pdu_dialog.cpp b/ui/qt/export_pdu_dialog.cpp index 2aeeb8ea60..d1f9c30120 100644 --- a/ui/qt/export_pdu_dialog.cpp +++ b/ui/qt/export_pdu_dialog.cpp @@ -26,7 +26,7 @@ #include <ui_export_pdu_dialog.h> #include "globals.h" -#include "pcap-encap.h" +#include <wiretap/pcap-encap.h> #include <epan/tap.h> #include <epan/exported_pdu.h> |