Merge remote-tracking branch 'origin/4.6'

Conflicts:
	src/plugins/projectexplorer/msvctoolchain.cpp

Change-Id: If2116aa2dbfdb9d07088595e791f8fa706b39e00

src/plugins/clangcodemodel/clangrefactoringengine.cpp

@@ -52,6 +52,8 @@ void RefactoringEngine::startLocalRenaming(const CppTools::CursorInEditor &data,
         return defaultCallback();
 
     QObject::connect(&m_watcher, &FutureCursorWatcher::finished, [=]() {
+        if (m_watcher.isCanceled())
+            return defaultCallback();
         const CppTools::CursorInfo info = m_watcher.result();
         if (info.useRanges.empty())
             return defaultCallback();