Merge remote-tracking branch 'origin/4.10'

Change-Id: Iaf27911e4e9fb762c1a24c84c458462bafe95728

2 files changed, 2 insertions, 7 deletions

diff --git a/src/plugins/clangformat/clangformat.pro b/src/plugins/clangformat/clangformat.pro
index e1ccdb98dc1..4d751db2ba4 100644
--- a/src/plugins/clangformat/clangformat.pro
+++ b/src/plugins/clangformat/clangformat.pro
@@ -6,11 +6,6 @@ include(../../shared/clang/clang_defines.pri)
 
 requires(!isEmpty(CLANGFORMAT_LIBS))
 
-win32 {
-    LLVM_BUILDMODE = $$system($$llvm_config --build-mode, lines)
-    CONFIG(debug, debug|release):requires(equals(LLVM_BUILDMODE, "Debug"))
-}
-
 LIBS += $$CLANGFORMAT_LIBS
 INCLUDEPATH += $$LLVM_INCLUDEPATH
 
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
index 14d59a757cc..59c2b592d78 100644
--- a/src/plugins/clangformat/clangformatutils.cpp
+++ b/src/plugins/clangformat/clangformatutils.cpp
@@ -197,13 +197,13 @@ static QString configForFile(Utils::FilePath fileName, bool checkForSettings)
 {
     QDir overrideDir;
     if (!checkForSettings || useProjectOverriddenSettings()) {
-        overrideDir = projectPath().toString();
+        overrideDir.setPath(projectPath().toString());
         if (!overrideDir.isEmpty() && overrideDir.exists(Constants::SETTINGS_FILE_NAME))
             return overrideDir.filePath(Constants::SETTINGS_FILE_NAME);
     }
 
     if (!checkForSettings || useGlobalOverriddenSettings()) {
-        overrideDir = globalPath().toString();
+        overrideDir.setPath(globalPath().toString());
         if (!overrideDir.isEmpty() && overrideDir.exists(Constants::SETTINGS_FILE_NAME))
             return overrideDir.filePath(Constants::SETTINGS_FILE_NAME);
     }