Merge remote-tracking branch 'origin/4.0'

Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/projectwizardpage.cpp
	src/plugins/projectexplorer/xcodebuildparser.h
	src/plugins/qmldesigner/qmldesignerplugin.cpp
	src/tools/clangbackend/ipcsource/translationunits.cpp

Change-Id: Ibf0857cf8dbf95fc9ac13d5c2112b3f4a2ca7de6

src/plugins/cpptools/cppcompletionassist.cpp

@@ -1513,7 +1513,12 @@ bool InternalCppCompletionAssistProcessor::globalCompletion(Scope *currentScope)
         }
     }
 
+    QSet<ClassOrNamespace *> processed;
     for (; currentBinding; currentBinding = currentBinding->parent()) {
+        if (processed.contains(currentBinding))
+            break;
+        processed.insert(currentBinding);
+
         foreach (ClassOrNamespace* u, currentBinding->usings())
             usingBindings.append(u);
 

src/plugins/cpptools/cppmodelmanager.cpp

@@ -900,6 +900,19 @@ QFuture<void> CppModelManager::updateProjectInfo(const ProjectInfo &newProjectIn
     return indexerFuture;
 }
 
+ProjectInfo CppModelManager::updateCompilerCallDataForProject(
+        ProjectExplorer::Project *project,
+        ProjectInfo::CompilerCallData &compilerCallData)
+{
+    QMutexLocker locker(&d->m_projectMutex);
+
+    ProjectInfo projectInfo = d->m_projectToProjectsInfo.value(project, ProjectInfo());
+    projectInfo.setCompilerCallData(compilerCallData);
+    d->m_projectToProjectsInfo.insert(project, projectInfo);
+
+    return projectInfo;
+}
+
 ProjectPart::Ptr CppModelManager::projectPartForId(const QString &projectPartId) const
 {
     return d->m_projectPartIdToProjectProjectPart.value(projectPartId);

src/plugins/cpptools/cppmodelmanager.h

@@ -28,6 +28,7 @@
 #include "cpptools_global.h"
 
 #include "cppmodelmanagersupport.h"
+#include "projectinfo.h"
 #include "projectpart.h"
 #include "projectpartheaderpath.h"
 
@@ -55,7 +56,6 @@ class CppEditorDocumentHandle;
 class CppIndexingSupport;
 class SymbolFinder;
 class WorkingCopy;
-class ProjectInfo;
 
 namespace Internal {
 class CppSourceProcessor;
@@ -94,6 +94,8 @@ public:
     QList<ProjectInfo> projectInfos() const;
     ProjectInfo projectInfo(ProjectExplorer::Project *project) const;
     QFuture<void> updateProjectInfo(const ProjectInfo &newProjectInfo);
+    ProjectInfo updateCompilerCallDataForProject(ProjectExplorer::Project *project,
+                                                 ProjectInfo::CompilerCallData &compilerCallData);
 
     /// \return The project part with the given project file
     ProjectPart::Ptr projectPartForId(const QString &projectPartId) const;

src/plugins/cpptools/cpptools.pro

@@ -1,5 +1,5 @@
 DEFINES += CPPTOOLS_LIBRARY
-win32-msvc*:DEFINES += _SCL_SECURE_NO_WARNINGS
+msvc: DEFINES += _SCL_SECURE_NO_WARNINGS
 include(../../qtcreatorplugin.pri)
 
 HEADERS += \