summaryrefslogtreecommitdiff
path: root/src/plugins/compilationdatabaseprojectmanager
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-08-29 09:59:45 +0200
committerEike Ziller <eike.ziller@qt.io>2019-09-12 06:37:41 +0000
commited9177f74cf5da5eda3d2bc670ef883b66ee9a9b (patch)
tree439123496d84c84e0977fb03034ccfea4299ff17 /src/plugins/compilationdatabaseprojectmanager
parent295fb99cc64243458832a3352b01707488324a6e (diff)
downloadqt-creator-ed9177f74cf5da5eda3d2bc670ef883b66ee9a9b.tar.gz
CppTools: Move ProjectUpdateInfo to ProjectExplorer
Used for updating project parts, so move it near RawProjectPart. Change-Id: I77aeffbdbfb3d2ec0de600f61dcf7fbb7a355a98 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/compilationdatabaseprojectmanager')
-rw-r--r--src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
index 4d763e333f..ec16d72bd5 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
@@ -29,7 +29,6 @@
#include "compilationdbparser.h"
#include <coreplugin/icontext.h>
-#include <cpptools/cppkitinfo.h>
#include <cpptools/cppprojectupdater.h>
#include <cpptools/projectinfo.h>
#include <projectexplorer/buildinfo.h>
@@ -170,7 +169,7 @@ void addDriverModeFlagIfNeeded(const ToolChain *toolchain,
RawProjectPart makeRawProjectPart(const Utils::FilePath &projectFile,
Kit *kit,
- CppTools::KitInfo &kitInfo,
+ ProjectExplorer::KitInfo &kitInfo,
const QString &workingDir,
const Utils::FilePath &fileName,
QStringList flags)
@@ -338,7 +337,7 @@ void createTree(std::unique_ptr<ProjectNode> &root,
void CompilationDatabaseProject::buildTreeAndProjectParts()
{
- CppTools::KitInfo kitInfo(this);
+ ProjectExplorer::KitInfo kitInfo(this);
QTC_ASSERT(kitInfo.isValid(), return);
// Reset toolchains to pick them based on the database entries.
kitInfo.cToolChain = nullptr;