aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2017-07-05 14:01:18 +0200
committerRoland Knall <rknall@gmail.com>2017-07-17 14:29:42 +0000
commitdc9adf904b7e78af15edcd18b0ac00e93c093f9a (patch)
tree7fe86d6064bfe325c9353f4eacbd9e39ece09647 /.gitignore
parentfcefe0d20bba8926e7ef8b61dab29ef8bbf2a0ce (diff)
.gitignore: Add ignore to moc file on new qt subfolder
See https://www.wireshark.org/lists/wireshark-dev/201706/msg00157.html and https://code.wireshark.org/review/#/c/22422/ for new folder Change-Id: If1ed71b844164fdf7a438d47244a0ad0e18b432b Reviewed-on: https://code.wireshark.org/review/22528 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore11
1 files changed, 5 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 76f4898397..6373e3335e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -187,16 +187,15 @@ qtshark
/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/*.rcc.cpp
-/ui/qt/moc_*.cxx
+/ui/qt/**/moc_*.cpp
+/ui/qt/**/moc_*.cpp_parameters
+/ui/qt/**/*.moc.cpp
+/ui/qt/**/*.rcc.cpp
+/ui/qt/**/moc_*.cxx
/ui/qt/qrc_*.cpp
/ui/qt/qrc_*.cxx
/ui/qt/ui_*.h
/ui/qt/console.lua
-/ui/qt/widgets/*.moc.cpp
/wireshark-qt*
# abi #