From ff0801d783e1d78ebb46e4ae18bf8ad3b5e55d2b Mon Sep 17 00:00:00 2001 From: sciencewhiz Date: Thu, 9 Jul 2020 21:29:50 -0700 Subject: [PATCH] [build] Revert change to DeriveLineEnding made in #1961 (#2581) Fixes windows with git autocrlf --- .clang-format | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.clang-format b/.clang-format index 14ff7a4a86..f5a95f7217 100644 --- a/.clang-format +++ b/.clang-format @@ -57,7 +57,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: true ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 4 Cpp11BracedListStyle: true -DeriveLineEnding: false +DeriveLineEnding: true DerivePointerAlignment: false DisableFormat: false ExperimentalAutoDetectBinPacking: false @@ -162,6 +162,5 @@ StatementMacros: - Q_UNUSED - QT_REQUIRE_VERSION TabWidth: 8 -UseCRLF: false UseTab: Never ...