feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.2'

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

Change-Id: I7c1c87f3b8ade43a07f6668565501042e967fa8b
This commit is contained in:
Eike Ziller
2016-11-16 16:04:59 +01:00
parent 6e17882bfc 82818cb90b
commit 4026864f38
72 changed files with 693 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/clangrefactoringbackend/source/clangtool.cpp
View File

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