Merge remote-tracking branch 'origin/4.6'

Conflicts:
	src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp

Change-Id: Ia723411f4b5c9c90f9786223ac6a7346d7ab9b99

src/plugins/clangcodemodel/clangrefactoringengine.h

@@ -57,7 +57,7 @@ public:
 
 private:
     using FutureCursorWatcher = QFutureWatcher<CppTools::CursorInfo>;
-    FutureCursorWatcher m_watcher;
+    std::unique_ptr<FutureCursorWatcher> m_watcher;
 };
 
 } // namespace ClangRefactoring