diff options
author | hjk <hjk@qt.io> | 2019-11-20 12:12:53 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-11-20 11:31:14 +0000 |
commit | 95ba85c86e0b5d9ef795b5affc54a0877aff2abf (patch) | |
tree | 3ef431ba410c98549636ed43857f259dffc3850b | |
parent | 264185245de3400c7fabbbf529bb660bff5acc56 (diff) |
ProjectExplorer: Use a Kit to initialize KitInfo
Change-Id: I70a83ff9a9da814b4e1ad9ce5e0b626105c09ca4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
12 files changed, 18 insertions, 17 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp index 9a9e69a08f..a18d93878e 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp @@ -175,7 +175,7 @@ static QStringList filterIncludes(const QString &absSrc, const QString &absBuild void AutotoolsBuildSystem::updateCppCodeModel() { - QtSupport::CppKitInfo kitInfo(project()); + QtSupport::CppKitInfo kitInfo(kit()); QTC_ASSERT(kitInfo.isValid(), return ); const Utils::FilePath projectFilePath = project()->projectFilePath(); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index b84a39625b..1c86e50048 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -441,7 +441,7 @@ void CMakeBuildSystem::updateProjectData() qCDebug(cmakeBuildSystemLog) << "Extra compilers updated."; } - QtSupport::CppKitInfo kitInfo(p); + QtSupport::CppKitInfo kitInfo(kit()); QTC_ASSERT(kitInfo.isValid(), return ); { diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index 89f82a780f..fcf87ab603 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -376,7 +376,7 @@ void CompilationDatabaseBuildSystem::triggerParsing() void CompilationDatabaseBuildSystem::buildTreeAndProjectParts() { - ProjectExplorer::KitInfo kitInfo(project()); + ProjectExplorer::KitInfo kitInfo(kit()); QTC_ASSERT(kitInfo.isValid(), return); // Reset toolchains to pick them based on the database entries. kitInfo.cToolChain = nullptr; diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 7a7e7c56e9..6aacd7e805 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -551,7 +551,7 @@ void GenericBuildSystem::refreshCppCodeModel() { if (!m_cppCodeModelUpdater) return; - QtSupport::CppKitInfo kitInfo(project()); + QtSupport::CppKitInfo kitInfo(kit()); QTC_ASSERT(kitInfo.isValid(), return); RawProjectPart rpp; diff --git a/src/plugins/projectexplorer/buildsystem.cpp b/src/plugins/projectexplorer/buildsystem.cpp index e6e6ad9677..ffeaf9627f 100644 --- a/src/plugins/projectexplorer/buildsystem.cpp +++ b/src/plugins/projectexplorer/buildsystem.cpp @@ -90,6 +90,11 @@ Target *BuildSystem::target() const return d->m_target; } +Kit *BuildSystem::kit() const +{ + return d->m_target->kit(); +} + void BuildSystem::emitParsingStarted() { QTC_ASSERT(!d->m_isParsing, return); diff --git a/src/plugins/projectexplorer/buildsystem.h b/src/plugins/projectexplorer/buildsystem.h index 96d37ec619..4007b46c70 100644 --- a/src/plugins/projectexplorer/buildsystem.h +++ b/src/plugins/projectexplorer/buildsystem.h @@ -53,6 +53,7 @@ public: Project *project() const; Target *target() const; + Kit *kit() const; Utils::FilePath projectFilePath() const; Utils::FilePath projectDirectory() const; diff --git a/src/plugins/projectexplorer/rawprojectpart.cpp b/src/plugins/projectexplorer/rawprojectpart.cpp index 54274f017c..86cd5dce14 100644 --- a/src/plugins/projectexplorer/rawprojectpart.cpp +++ b/src/plugins/projectexplorer/rawprojectpart.cpp @@ -150,14 +150,9 @@ void RawProjectPart::setBuildTargetType(BuildTargetType type) buildTargetType = type; } -KitInfo::KitInfo(Project *project) +KitInfo::KitInfo(Kit *kit) + : kit(kit) { - // Kit - if (Target *target = project->activeTarget()) - kit = target->kit(); - else - kit = KitManager::defaultKit(); - // Toolchains if (kit) { cToolChain = ToolChainKitAspect::toolChain(kit, Constants::C_LANGUAGE_ID); diff --git a/src/plugins/projectexplorer/rawprojectpart.h b/src/plugins/projectexplorer/rawprojectpart.h index aa3a6d376b..321344ef4e 100644 --- a/src/plugins/projectexplorer/rawprojectpart.h +++ b/src/plugins/projectexplorer/rawprojectpart.h @@ -125,7 +125,7 @@ using RawProjectParts = QVector<RawProjectPart>; class PROJECTEXPLORER_EXPORT KitInfo { public: - explicit KitInfo(Project *project); + explicit KitInfo(Kit *kit); bool isValid() const; diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 381bb9ce6e..b6998fa819 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -1012,7 +1012,7 @@ void QbsBuildSystem::updateCppCodeModel() qDeleteAll(m_extraCompilers); m_extraCompilers.clear(); - QtSupport::CppKitInfo kitInfo(project()); + QtSupport::CppKitInfo kitInfo(kit()); QTC_ASSERT(kitInfo.isValid(), return); RawProjectParts rpps; diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index d0c03864c8..0df7b07fcd 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -244,7 +244,7 @@ void QmakeBuildSystem::updateCppCodeModel() { m_toolChainWarnings.clear(); - QtSupport::CppKitInfo kitInfo(project()); + QtSupport::CppKitInfo kitInfo(kit()); QTC_ASSERT(kitInfo.isValid(), return); QList<ProjectExplorer::ExtraCompiler *> generators; diff --git a/src/plugins/qtsupport/qtcppkitinfo.cpp b/src/plugins/qtsupport/qtcppkitinfo.cpp index 17a201dfc2..c9e892f6f9 100644 --- a/src/plugins/qtsupport/qtcppkitinfo.cpp +++ b/src/plugins/qtsupport/qtcppkitinfo.cpp @@ -30,8 +30,8 @@ namespace QtSupport { -CppKitInfo::CppKitInfo(ProjectExplorer::Project *project) - : ProjectExplorer::KitInfo(project) +CppKitInfo::CppKitInfo(ProjectExplorer::Kit *kit) + : ProjectExplorer::KitInfo(kit) { if (kit && (qtVersion = QtKitAspect::qtVersion(kit))) { if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5, 0, 0)) diff --git a/src/plugins/qtsupport/qtcppkitinfo.h b/src/plugins/qtsupport/qtcppkitinfo.h index fe5d90e317..189d7fee0a 100644 --- a/src/plugins/qtsupport/qtcppkitinfo.h +++ b/src/plugins/qtsupport/qtcppkitinfo.h @@ -36,7 +36,7 @@ class BaseQtVersion; class QTSUPPORT_EXPORT CppKitInfo : public ProjectExplorer::KitInfo { public: - CppKitInfo(ProjectExplorer::Project *project); + CppKitInfo(ProjectExplorer::Kit *kit); BaseQtVersion *qtVersion = nullptr; }; |