feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.0'

Browse Source 
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
This commit is contained in:
Eike Ziller
2016-05-03 11:49:01 +02:00
parent 5fa52d2ff9 9b69b789ab
commit 0f94aa3f4d
169 changed files with 4156 additions and 1867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cpptools/cppmodelmanager.h
View File

@@ -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;