Merge remote-tracking branch 'origin/4.2'

Change-Id: I957c22020fbacb2f631220b0cdc7fa16a782798b
2016-11-21 10:25:45 +02:00
parent 6a061b2a35 97c9213358
commit 6d1d1a4416
36 changed files with 488 additions and 308 deletions
--- a/tests/unit/unittest/refactoringclient-test.cpp
+++ b/tests/unit/unittest/refactoringclient-test.cpp
@@ -185,7 +185,8 @@ void RefactoringClient::SetUp()
    projectPart->files.push_back(projectFile);

    commandLine = RefactoringCompilerOptionsBuilder::build(projectPart.data(),
-                                                           projectFile.kind);
+                                                           projectFile.kind,
+                                                           RefactoringCompilerOptionsBuilder::PchUsage::None);

    client.setSearchHandle(&mockSearchHandle);
 }