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

Qmake: Move some non-configuration code from build config to build system

Browse Source 
Change-Id: I6fdf20e740c2824cabb3659f36379f9325ab97bd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-11-20 15:51:44 +01:00
parent e63444b45d
commit 5bac811432
5 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,6 +84,11 @@ QmakeBuildConfiguration *QMakeStep::qmakeBuildConfiguration() const
return qobject_cast<QmakeBuildConfiguration *>(buildConfiguration());
}
QmakeBuildSystem *QMakeStep::qmakeBuildSystem() const
{
return qmakeBuildConfiguration()->qmakeBuildSystem();
}
///
/// Returns all arguments
/// That is: possbile subpath
@@ -359,7 +364,7 @@ void QMakeStep::setUserArguments(const QString &arguments)
emit userArgumentsChanged();
emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged();
qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
qmakeBuildSystem()->scheduleUpdateAllNowOrLater();
}
QStringList QMakeStep::extraArguments() const
@@ -373,7 +378,7 @@ void QMakeStep::setExtraArguments(const QStringList &args)
m_extraArgs = args;
emit extraArgumentsChanged();
emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged();
qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
qmakeBuildSystem()->scheduleUpdateAllNowOrLater();
}
}
@@ -402,7 +407,7 @@ void QMakeStep::setLinkQmlDebuggingLibrary(bool enable)
emit linkQmlDebuggingLibraryChanged();
emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged();
qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
qmakeBuildSystem()->scheduleUpdateAllNowOrLater();
}
bool QMakeStep::useQtQuickCompiler() const
@@ -420,7 +425,7 @@ void QMakeStep::setUseQtQuickCompiler(bool enable)
emit useQtQuickCompilerChanged();
emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged();
qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
qmakeBuildSystem()->scheduleUpdateAllNowOrLater();
}
bool QMakeStep::separateDebugInfo() const
@@ -437,7 +442,7 @@ void QMakeStep::setSeparateDebugInfo(bool enable)
emit separateDebugInfoChanged();
emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged();
qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
qmakeBuildSystem()->scheduleUpdateAllNowOrLater();
}
FilePath QMakeStep::makeCommand() const