1 files changed, 9 insertions, 46 deletions
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index 479d5576b0..f09ec6e8e1 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -105,21 +105,19 @@
 #include "ui/simple_dialog.h"
 #include "ui/ui_util.h"
 
+#if 0
 #include "capture-pcap-util.h"
+#endif
 
 #ifdef HAVE_LIBPCAP
-#  include <capchild/capture_ifinfo.h>
+#  include "caputils/capture_ifinfo.h"
 #  include "ui/capture.h"
 #  include <capchild/capture_sync.h>
 #endif
 
-#ifdef HAVE_LIBCAP
-# include <sys/capability.h>
-#endif
-
 #ifdef _WIN32
-#  include "capture-wpcap.h"
-#  include "capture_wpcap_packet.h"
+#  include "caputils/capture-wpcap.h"
+#  include "caputils/capture_wpcap_packet.h"
 #  include <tchar.h> /* Needed for Unicode */
 #  include <wsutil/unicode-utils.h>
 #  include <commctrl.h>
@@ -410,9 +408,9 @@ get_wireshark_qt_compiled_info(GString *str)
                     "Qt (version unknown)");
 #endif
 
-    /* Libpcap */
+    /* Capture libraries */
     g_string_append(str, ", ");
-    get_compiled_pcap_version(str);
+    get_compiled_caplibs_version(str);
 
     /* LIBZ */
     g_string_append(str, ", ");
@@ -426,41 +424,6 @@ get_wireshark_qt_compiled_info(GString *str)
 #else /* HAVE_LIBZ */
     g_string_append(str, "without libz");
 #endif /* HAVE_LIBZ */
-
-    /*
-     * XXX - these libraries are actually used only by dumpcap,
-     * but we mention them here so that a user reporting a bug
-     * can get information about dumpcap's libraries without
-     * having to run dumpcap.
-     */
-#ifndef _WIN32
-    /* This is UN*X-only. */
-    /* LIBCAP */
-    g_string_append(str, ", ");
-#ifdef HAVE_LIBCAP
-    g_string_append(str, "with POSIX capabilities");
-#ifdef _LINUX_CAPABILITY_VERSION
-    g_string_append(str, " (Linux)");
-#endif /* _LINUX_CAPABILITY_VERSION */
-#else /* HAVE_LIBCAP */
-    g_string_append(str, "without POSIX capabilities");
-#endif /* HAVE_LIBCAP */
-#endif /* _WIN32 */
-
-#ifdef __linux__
-    /* This is a Linux-specific library. */
-    /* LIBNL */
-    g_string_append(str, ", ");
-#if defined(HAVE_LIBNL1)
-    g_string_append(str, "with libnl 1");
-#elif defined(HAVE_LIBNL2)
-    g_string_append(str, "with libnl 2");
-#elif defined(HAVE_LIBNL3)
-    g_string_append(str, "with libnl 3");
-#else /* no libnl */
-    g_string_append(str, "without libnl");
-#endif /* libnl version */
-#endif /* __linux__ */
 }
 
 // xxx copied from ../gtk/main.c
@@ -485,9 +448,9 @@ static void
 get_wireshark_runtime_info(GString *str)
 {
 #ifdef HAVE_LIBPCAP
-    /* Libpcap */
+    /* Capture libraries */
     g_string_append(str, ", ");
-    get_runtime_pcap_version(str);
+    get_runtime_caplibs_version(str);
 #endif
 
     /* zlib */