From 0abcf7b61802b580175bfda7be78c88d70182b8f Mon Sep 17 00:00:00 2001
From: Ivan Donchevskii <ivan.donchevskii@qt.io>
Date: Wed, 6 Mar 2019 14:45:47 +0100
Subject: [PATCH] ClangFormat: Fix path for the overridden project
 configuration

Change-Id: I4748c994016851293a6ad5490208fb4e4bbc7999
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
---
 src/plugins/clangformat/clangformatconfigwidget.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp
index feb61f3276a..72e1778999a 100644
--- a/src/plugins/clangformat/clangformatconfigwidget.cpp
+++ b/src/plugins/clangformat/clangformatconfigwidget.cpp
@@ -102,6 +102,7 @@ void ClangFormatConfigWidget::showGlobalCheckboxes()
 static bool projectConfigExists()
 {
     return Utils::FileName::fromString(Core::ICore::userResourcePath())
+        .appendPath("clang-format")
         .appendPath(currentProjectUniqueId())
         .appendPath((Constants::SETTINGS_FILE_NAME))
         .exists();
@@ -208,7 +209,7 @@ void ClangFormatConfigWidget::apply()
 
     QString filePath = Core::ICore::userResourcePath();
     if (m_project)
-        filePath += "/" + currentProjectUniqueId();
+        filePath += "/clang-format/" + currentProjectUniqueId();
     filePath += "/" + QLatin1String(Constants::SETTINGS_FILE_NAME);
 
     QFile file(filePath);