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

5
src/plugins/clangrefactoring/refactoringengine.cpp
View File

@@ -32,6 +32,8 @@
#include <refactoringserverinterface.h>
#include <requestsourcelocationforrenamingmessage.h>
#include <cpptools/cpptoolsreuse.h>
#include <QTextCursor>
#include <QTextDocument>
@@ -59,7 +61,8 @@ void RefactoringEngine::startLocalRenaming(const QTextCursor &textCursor,
client.setLocalRenamingCallback(std::move(renameSymbolsCallback));
auto commandLine = RefactoringCompilerOptionsBuilder::build(projectPart,
fileKindInProjectPart(projectPart, filePath.toString()));
fileKindInProjectPart(projectPart, filePath.toString()),
CppTools::getPchUsage());
commandLine.push_back(filePath.toString());