aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.editorconfig4
-rw-r--r--ui/qt/.editorconfig9
-rw-r--r--ui/qt/Makefile.am1
3 files changed, 2 insertions, 12 deletions
diff --git a/.editorconfig b/.editorconfig
index 142f18fe39..ae27dd7298 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -25,8 +25,8 @@ indent_size = 8
indent_style = space
indent_size = 4
-# C
-[*.[ch]]
+# C/C++
+[*.{c,cpp,h}]
indent_style = space
indent_size = 4
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 \