diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-15 19:26:25 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-03-23 02:00:21 +0000 |
| commit | 3a9feb4118c99d26fae843b0dc57d2cb0a092c0e (patch) | |
| tree | d7b95ed6947b667074c9ed7eedbfb57fe5b33fc4 /ui | |
| parent | d93331e124dea5ff1237124a72030922b9d05dc5 (diff) | |
EditorConfig: Add C++ to root file
Change-Id: I716bf59e401d7764692e524506756eb30ddb75f2
Reviewed-on: https://code.wireshark.org/review/14572
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, 0 insertions, 10 deletions
diff --git a/ui/qt/.editorconfig b/ui/qt/.editorconfig deleted file mode 100644 index 2de301a74a..0000000000 --- a/ui/qt/.editorconfig +++ /dev/null @@ -1,9 +0,0 @@ -# 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 9940f270f8..c34010c8c9 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -326,7 +326,6 @@ EXTRA_DIST = \ $(QRC_FILES) \ $(TS_FILES) \ $(QM_FILES) \ - .editorconfig \ CMakeLists.txt \ doxygen.cfg.in \ Makefile.common \ |