forked from qt-creator/qt-creator
ProjectExplorer: Rename KitInformation to KitAspect
The name "KitInformation" does not properly convey the fact that it represents a certain *aspect* of a kit. The same goes for "KitConfigWidget", which in addition was inconsistent with "KitInformation". We now use "KitAspect" and "KitAspectWidget". Change-Id: I9804ee4cedc4d61fad533ea1dd4e4720e67fde97 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -61,25 +61,25 @@ BuildDirParameters::BuildDirParameters(CMakeBuildConfiguration *bc)
|
||||
if (Utils::HostOsInfo::isAnyUnixHost())
|
||||
environment.set("ICECC", "no");
|
||||
|
||||
cmakeToolId = CMakeKitInformation::cmakeToolId(k);
|
||||
cmakeToolId = CMakeKitAspect::cmakeToolId(k);
|
||||
|
||||
auto tc = ToolChainKitInformation::toolChain(k, Constants::CXX_LANGUAGE_ID);
|
||||
auto tc = ToolChainKitAspect::toolChain(k, Constants::CXX_LANGUAGE_ID);
|
||||
if (tc)
|
||||
cxxToolChainId = tc->id();
|
||||
tc = ToolChainKitInformation::toolChain(k, Constants::C_LANGUAGE_ID);
|
||||
tc = ToolChainKitAspect::toolChain(k, Constants::C_LANGUAGE_ID);
|
||||
if (tc)
|
||||
cToolChainId = tc->id();
|
||||
sysRoot = SysRootKitInformation::sysRoot(k);
|
||||
sysRoot = SysRootKitAspect::sysRoot(k);
|
||||
|
||||
expander = k->macroExpander();
|
||||
|
||||
configuration = bc->configurationForCMake();
|
||||
|
||||
generator = CMakeGeneratorKitInformation::generator(k);
|
||||
extraGenerator = CMakeGeneratorKitInformation::extraGenerator(k);
|
||||
platform = CMakeGeneratorKitInformation::platform(k);
|
||||
toolset = CMakeGeneratorKitInformation::toolset(k);
|
||||
generatorArguments = CMakeGeneratorKitInformation::generatorArguments(k);
|
||||
generator = CMakeGeneratorKitAspect::generator(k);
|
||||
extraGenerator = CMakeGeneratorKitAspect::extraGenerator(k);
|
||||
platform = CMakeGeneratorKitAspect::platform(k);
|
||||
toolset = CMakeGeneratorKitAspect::toolset(k);
|
||||
generatorArguments = CMakeGeneratorKitAspect::generatorArguments(k);
|
||||
}
|
||||
|
||||
bool BuildDirParameters::isValid() const { return buildConfiguration && cmakeTool(); }
|
||||
|
Reference in New Issue
Block a user