diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-05-02 13:24:04 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-05-03 04:07:25 +0000 |
| commit | d1a2b6973f97419d7817594ba7832022bdbdf3b5 (patch) | |
| tree | 660ca293227f455951e647503b6177cde71dae2d | |
| parent | ef4080bc3a7130f9687ef05bc90bac1155e9144f (diff) | |
Editorconfig: Add a filename match for Makefiles.
The "Autotools, Make" section in .editorconfig didn't have an associated
filepath glob pattern, which meant that it matched the preceding
pattern, which was "*". This would appear to explain why VS Code
mysteriously forced 8-character tabs for some files.
Remove ui/qt/Makefile_custom.common while we're here.
Change-Id: I5a84cc53c992bb2a95036cb98dc97cc7eb6b1299
Reviewed-on: https://code.wireshark.org/review/27281
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | .editorconfig | 3 | ||||
| -rw-r--r-- | ui/qt/Makefile_custom.common | 12 |
2 files changed, 2 insertions, 13 deletions
diff --git a/.editorconfig b/.editorconfig index 2919945049..987cfa7978 100644 --- a/.editorconfig +++ b/.editorconfig @@ -15,7 +15,8 @@ charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true -# Autotools, Make +# Makefiles. Although we dropped Autotools we still have a few lying around. +[Makefile*] indent_style = tab indent_size = 8 diff --git a/ui/qt/Makefile_custom.common b/ui/qt/Makefile_custom.common deleted file mode 100644 index ec8e7496a8..0000000000 --- a/ui/qt/Makefile_custom.common +++ /dev/null @@ -1,12 +0,0 @@ -# -# You can add custom GUI files here -# - -#Add GUI source files here -WIRESHARK_CUSTOM_QT_SRC = - -#Add your tap source files here: -WIRESHARK_CUSTOM_TAP_SRC = - -#Add headers here: -WIRESHARK_CUSTOM_HDRS = |