diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-12-02 09:51:34 -0800 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2016-03-08 10:44:17 +0000 |
commit | b63a8bdcb7c44b6d3bf00ecfce24830c1827721d (patch) | |
tree | 488f03fc5f6e49da68b3932af887016c2828a726 /ui | |
parent | 4dae247ed217031fa7d8158d895b19de95ee5141 (diff) |
Start adding EditorConfig files.
Add EditorConfig files where we currently have consistent indentation.
This might let us get rid of our editor modeline footers at some point.
Change-Id: I156f8d25cfa0050786eb2186c4b2e6d183c3a9ce
Reviewed-on: https://code.wireshark.org/review/12383
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/qt/.editorconfig | 9 | ||||
-rw-r--r-- | ui/qt/Makefile.am | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ui/qt/.editorconfig b/ui/qt/.editorconfig new file mode 100644 index 0000000000..2de301a74a --- /dev/null +++ b/ui/qt/.editorconfig @@ -0,0 +1,9 @@ +# Qt sources + +# Qt Creator defaults to 4 columns of spaces but doesn't yet support +# EditorConfig: +# https://bugreports.qt.io/browse/QTCREATORBUG-14013 +[*.{cpp,h}] +indent_style = space +indent_size = 4 +tab_width = 8 diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index 6263fcec1e..5683b06715 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -291,6 +291,7 @@ EXTRA_DIST = \ $(QRC_FILES) \ $(TS_FILES) \ $(QM_FILES) \ + .editorconfig \ CMakeLists.txt \ doxygen.cfg.in \ Makefile.common \ |