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

ProjectExplorer: Introduce a ProjectConfiguration::kit() function

Browse Source 
For convenience, and use it in some places.

Change-Id: I8f7cb502b37b2fbf4cf2d17cac9c6299558332dc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-09-07 15:56:18 +02:00
parent 552a1296fe
commit 61bfd32438
34 changed files with 82 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -219,13 +219,13 @@ bool QmakeBuildConfiguration::fromMap(const QVariantMap &map)
m_qmakeBuildConfiguration = BaseQtVersion::QmakeBuildConfigs(map.value(QLatin1String(BUILD_CONFIGURATION_KEY)).toInt());
m_lastKitState = LastKitState(target()->kit());
m_lastKitState = LastKitState(kit());
return true;
}
void QmakeBuildConfiguration::kitChanged()
{
LastKitState newState = LastKitState(target()->kit());
LastKitState newState = LastKitState(kit());
if (newState != m_lastKitState) {
// This only checks if the ids have changed!
// For that reason the QmakeBuildConfiguration is also connected
@@ -237,8 +237,8 @@ void QmakeBuildConfiguration::kitChanged()
void QmakeBuildConfiguration::updateProblemLabel()
{
ProjectExplorer::Kit * const k = target()->kit();
const QString proFileName = target()->project()->projectFilePath().toString();
ProjectExplorer::Kit * const k = kit();
const QString proFileName = project()->projectFilePath().toString();
// Check for Qt version:
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k);
@@ -442,7 +442,7 @@ void QmakeBuildConfiguration::forceQtQuickCompiler(bool enable)
QStringList QmakeBuildConfiguration::configCommandLineArguments() const
{
QStringList result;
BaseQtVersion *version = QtKitAspect::qtVersion(target()->kit());
BaseQtVersion *version = QtKitAspect::qtVersion(kit());
BaseQtVersion::QmakeBuildConfigs defaultBuildConfiguration =
version ? version->defaultBuildConfig() : BaseQtVersion::QmakeBuildConfigs(BaseQtVersion::DebugBuild | BaseQtVersion::BuildAll);
BaseQtVersion::QmakeBuildConfigs userBuildConfiguration = m_qmakeBuildConfiguration;
@@ -508,7 +508,7 @@ QmakeBuildConfiguration::MakefileState QmakeBuildConfiguration::compareToImportF
return MakefileMissing;
}
BaseQtVersion *version = QtKitAspect::qtVersion(target()->kit());
BaseQtVersion *version = QtKitAspect::qtVersion(kit());
if (!version) {
qCDebug(logs) << "**No qt version in kit";
return MakefileForWrongProject;
@@ -806,7 +806,7 @@ BuildConfiguration::BuildType QmakeBuildConfiguration::buildType() const
void QmakeBuildConfiguration::addToEnvironment(Environment &env) const
{
setupBuildEnvironment(target()->kit(), env);
setupBuildEnvironment(kit(), env);
}
void QmakeBuildConfiguration::setupBuildEnvironment(Kit *k, Environment &env)
@@ -853,7 +853,7 @@ bool QmakeBuildConfiguration::regenerateBuildFiles(Node *node)
BuildManager::appendStep(qs, BuildManager::displayNameForStepId(ProjectExplorer::Constants::BUILDSTEPS_CLEAN));
QmakeProFileNode *proFile = nullptr;
if (node && node != target()->project()->rootProjectNode())
if (node && node != project()->rootProjectNode())
proFile = dynamic_cast<QmakeProFileNode *>(node);
setSubNodeBuild(proFile);

4
src/plugins/qmakeprojectmanager/qmakemakestep.cpp
View File

@@ -178,13 +178,13 @@ bool QmakeMakeStep::init()
void QmakeMakeStep::setupOutputFormatter(Utils::OutputFormatter *formatter)
{
formatter->addLineParser(new ProjectExplorer::GnuMakeParser());
ToolChain *tc = ToolChainKitAspect::cxxToolChain(target()->kit());
ToolChain *tc = ToolChainKitAspect::cxxToolChain(kit());
OutputTaskParser *xcodeBuildParser = nullptr;
if (tc && tc->targetAbi().os() == Abi::DarwinOS) {
xcodeBuildParser = new XcodebuildParser;
formatter->addLineParser(xcodeBuildParser);
}
QList<Utils::OutputLineParser *> additionalParsers = target()->kit()->createOutputParsers();
QList<Utils::OutputLineParser *> additionalParsers = kit()->createOutputParsers();
// make may cause qmake to be run, add last to make sure it has a low priority.
additionalParsers << new QMakeParser;

8
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -155,7 +155,7 @@ QMakeStepConfig QMakeStep::deducedArguments() const
}
}
BaseQtVersion *version = QtKitAspect::qtVersion(target()->kit());
BaseQtVersion *version = QtKitAspect::qtVersion(kit);
config.archConfig = QMakeStepConfig::targetArchFor(targetAbi, version);
config.osType = QMakeStepConfig::osTypeFor(targetAbi, version);
@@ -170,7 +170,7 @@ bool QMakeStep::init()
{
m_wasSuccess = true;
QmakeBuildConfiguration *qmakeBc = qmakeBuildConfiguration();
const BaseQtVersion *qtVersion = QtKitAspect::qtVersion(target()->kit());
const BaseQtVersion *qtVersion = QtKitAspect::qtVersion(kit());
if (!qtVersion) {
emit addOutput(tr("No Qt version configured."), BuildStep::OutputFormat::ErrorMessage);
@@ -409,7 +409,7 @@ QString QMakeStep::makeArguments(const QString &makefile) const
QString QMakeStep::effectiveQMakeCall() const
{
BaseQtVersion *qtVersion = QtKitAspect::qtVersion(target()->kit());
BaseQtVersion *qtVersion = QtKitAspect::qtVersion(kit());
QString qmake = qtVersion ? qtVersion->qmakeCommand().toUserOutput() : QString();
if (qmake.isEmpty())
qmake = tr("<no Qt version>");
@@ -432,7 +432,7 @@ QStringList QMakeStep::parserArguments()
{
// NOTE: extra parser args placed before the other args intentionally
QStringList result = m_extraParserArgs;
BaseQtVersion *qt = QtKitAspect::qtVersion(target()->kit());
BaseQtVersion *qt = QtKitAspect::qtVersion(kit());
QTC_ASSERT(qt, return QStringList());
for (QtcProcess::ConstArgIterator ait(allArguments(qt, ArgumentFlag::Expand)); ait.next(); ) {
if (ait.isSimple())