diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-25 13:18:31 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-25 13:18:31 +0200 |
| commit | 6896546ba5a6ae59416fe4f527294ba731235218 (patch) | |
| tree | b5b5c8b554f6dcdf391459d996100dbb265e55d1 /src/plugins/cpptools/cppmodelmanagerinterface.h | |
| parent | e2ce17ef00218af3db35118b036ebf19834b86e8 (diff) | |
| parent | 1dd9a54ab63d267268b6262b11c7b0189370f174 (diff) | |
| download | qt-creator-6896546ba5a6ae59416fe4f527294ba731235218.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
src/plugins/cpptools/cppmodelmanager.cpp
Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanagerinterface.h')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanagerinterface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.h b/src/plugins/cpptools/cppmodelmanagerinterface.h index 07c945e19a..cf33a7aaba 100644 --- a/src/plugins/cpptools/cppmodelmanagerinterface.h +++ b/src/plugins/cpptools/cppmodelmanagerinterface.h @@ -215,7 +215,7 @@ public: virtual QList<ProjectInfo> projectInfos() const = 0; virtual ProjectInfo projectInfo(ProjectExplorer::Project *project) const = 0; - virtual void updateProjectInfo(const ProjectInfo &pinfo) = 0; + virtual QFuture<void> updateProjectInfo(const ProjectInfo &pinfo) = 0; virtual QList<ProjectPart::Ptr> projectPart(const QString &fileName) const = 0; virtual QStringList includePaths() = 0; |