Qt: fix assertion failure when redissecting with a debug build of Qt

[metze/wireshark/wip.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 462e7d8aaca6c2aaf624d3d09da08f6c3b7f3e6f..cc67c2b7d4ea132c07c0f03d008ddf6c3330a71c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,95 +26,37 @@
 *_dict.c
 *_lex.h
 init.lua
-epan/declare_wslua.h
 epan/dissectors/dcerpc/idl2wrs
+epan/dissectors/dcerpc/*/packet-dcerpc-*.[hc]
 epan/dissectors/mesa
 epan/dissectors/xcbproto
 epan/dissectors/packet-ncp2222.c
-epan/dissectors/register-cache.pkl
-epan/dissectors/register.c
+epan/dissectors/dissectors.c
+epan/dissectors/dissectors.in.txt
 epan/dtd_parse.c
 epan/dtd_preparse.c
-epan/packet-ncp2222.c
-epan/register-cache.pkl
-epan/register.c
-epan/register_wslua.c
-epan/taps.txt
-epan/taps_wslua.c
 epan/uat_load.c
+epan/version_info.c
 epan/wslua/declare_wslua.h
 epan/wslua/register_wslua.c
 epan/wslua/taps.txt
 epan/wslua/taps_wslua.c
 epan/ps.c
-ui/cli/tshark-tap-register-cache.pkl
-plugin.c
-plugins/mate/mate_parser.c
-version.h
+plugins/epan/*/plugin.c
+plugins/wiretap/*/plugin.c
+plugins/codecs/*/plugin.c
+plugins/epan/mate/mate_parser.c
 tools/lemon/lemon
-tools/setuid-root.pl
 tshark-tap-register.c
 wiretap/ascend.c
 wiretap/ascend.h
 wiretap/k12text.c
+wiretap/version_info.c
 wireshark-tap-register.c
-wireshark-tap-register-cache.pkl
-ui/gtk/wireshark-gresources.c
-ui/gtk/wireshark-gresources.h
-
-# Generated makefile system #
-#############################
-.dirstamp
-*.sym
-aclocal.m4
-androiddump
-autom4te.cache
-capinfos
-captype
-compile
-config.h
-config.h.in
-config.cache
-config.log
-config.status
-configure
-depcomp
-dftest
-dumpcap
-editcap
-echld_test
-exntest
-install-sh
-libtool
-libtool.m4
-lt~obsolete.m4
-ltmain.sh
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-Makefile
-Makefile.in
-mergecap
-missing
-oids_test
-randpkt
-randpktdump
-rawshark
-reordercap
-reassemble_test
-sshdump
-stamp-h1
-text2pcap
-tfshark
-tshark
-tvbtest
-wireshark
-wmem_test
-ylwrap
-
 
 # CMake #
 ##################
+cmake-build-*/
 CMakeCache.txt
 CMakeFiles
 CMakeLists.txt.user*
@@ -124,24 +66,15 @@ CPackSourceConfig.cmake
 lib/
 WiresharkConfig.cmake
 WiresharkConfigVersion.cmake
-epan/_regc.tmp
 wireshark.pc
 run/
-tshark-tap-register-cache.pkl
 build.ninja
 rules.ninja
 .ninja_deps
 .ninja_log
-asn1/*/*-stamp
-
-
-# Generated dir #
-##################
-.deps
-.libs
-packaging/rpm/RPMS
-packaging/rpm/SRPMS
-
+epan/dissectors/asn1/*/*-stamp
+epan/dissectors/pidl/*-stamp
+epan/dissectors/dcerpc/*-stamp
 
 # Doc #
 ########
@@ -150,8 +83,6 @@ packaging/rpm/SRPMS
 AUTHORS.git
 AUTHORS-SHORT
 AUTHORS-SHORT-FORMAT
-doxygen.cfg
-doxygen-*.tag
 help/faq.txt
 pod2htm[di].tmp
 wireshark.pod
@@ -161,35 +92,24 @@ docbook/developer-guide*.xml
 docbook/user-guide-toc.hhc
 docbook/user-guide.hhp
 docbook/user-guide*.xml
-docbook/ws?g_src/WS?G_*.dbk
-docbook/*-guide-*.fo
 docbook/*-guide-*.pdf
 docbook/ws?g_html/
 docbook/ws?g_html_chunked/
 docbook/ws?g_chm/
 docbook/release-notes-*.pdf
 docbook/release-notes.txt
-docbook/wsdg.validated
 docbook/wsluarm
 docbook/wsluarm_src/
-docbook/wsug.validated
 wsar_html/
 wsar_html.zip
 
 # Qt #
 ######
-qtshark
-*.rcc.cpp
 /ui/qt/__/
-/ui/qt/*.qrc.depends
-/ui/qt/*.pro.user
-#/ui/qt/*.qm
-/ui/qt/moc_*.cpp
-/ui/qt/moc_*.cpp_parameters
-/ui/qt/*.moc.cpp
-/ui/qt/moc_*.cxx
+/ui/qt/*.qm
+/ui/qt/**/moc_*.cpp
+/ui/qt/i18n.qrc
 /ui/qt/qrc_*.cpp
-/ui/qt/qrc_*.cxx
 /ui/qt/ui_*.h
 /ui/qt/console.lua
 /wireshark-qt*
@@ -217,7 +137,6 @@ wsutil/abi-descriptor.xml
 *.pdb
 *.nativecodeanalysis.xml
 *.rc
-!adns_dll.rc
 !image/file_dlg_win32.rc
 *.res
 *.vcxproj*
@@ -232,17 +151,17 @@ Wireshark.sln
 Wireshark.*.suo
 x64/
 _libs_check_
-/wireshark-gtk*
 doc/ws.css
-ui/qt/config.pri
 packaging/nsis/all-manifest.nsh
-packaging/nsis/gtk-dll-manifest.nsh
 /packaging/portableapps/WiresharkPortable/
 /zlib/
+wireshark-win??-libs*/
 
 # Misc #
 ########
 .vagrant
+.vscode
+.idea
 *.swp
 *~
 .DS_Store
@@ -254,13 +173,14 @@ macosx-support-libs
 packaging/macosx/COPYING.txt
 packaging/macosx/Info.plist
 packaging/macosx/osx-dmg.sh
+packaging/macosx/PkgInfo
 packaging/macosx/Wireshark_package.pmdoc/index.xml
 packaging/nsis/config.nsh
 packaging/nsis/qt-dll-manifest.nsh
 packaging/portableapps/Files/
 packaging/portableapps/appinfo.ini
-packaging/portableapps/distribution.nmake
 packaging/rpm/SPECS/wireshark.spec
-packaging/svr4/checkinstall
-packaging/svr4/pkginfo
 vgcore.*
+Wireshark.*
+.pytest_cache/
+test/*.log