Merge remote-tracking branch 'origin/4.2'

Conflicts:
	src/plugins/clangrefactoring/refactoringengine.cpp
	src/tools/clangrefactoringbackend/source/symbolfinder.cpp

Change-Id: I7c1c87f3b8ade43a07f6668565501042e967fa8b

src/tools/clangrefactoringbackend/source/clangrefactoringbackend_global.h

@@ -35,7 +35,7 @@ namespace ClangBackEnd {
 using USRName = llvm::SmallVector<char, 128>;
 
 // use std::filesystem::path if it is supported by all compilers
-#ifdef WIN32
+#ifdef _WIN32
 const char nativeSeperator = '\\';
 #else
 const char nativeSeperator = '/';

src/tools/clangrefactoringbackend/source/clangtool.cpp

@@ -33,7 +33,7 @@ namespace {
 
 std::string toNativePath(std::string &&path)
 {
-#ifdef WIN32
+#ifdef _WIN32
     std::replace(path.begin(), path.end(), '/', '\\');
 #endif
 

src/tools/clangrefactoringbackend/source/sourcelocationsutils.h

@@ -61,7 +61,7 @@ Utils::SmallString fromNativePath(Container container)
 {
     Utils::SmallString path(container.data(), container.size());
 
-#ifdef WIN32
+#ifdef _WIN32
     std::replace(path.begin(), path.end(), '\\', '/');
 #endif