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

ProjectExplorer: Rename 'extraAspect' to 'aspect'

Browse Source 
Using aspects is the standard pattern nowadays, there's nothing 'extra'
to them anymore.

Change-Id: I446f9d7b1db58a4899e5e44df33ce51f655e7be4
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2018-09-07 13:29:45 +02:00
parent 2f6c6b632c
commit 1c9410e353
27 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
View File

@@ -110,11 +110,11 @@ void QbsRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &
void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
{
if (auto dyldAspect = extraAspect<UseDyldSuffixAspect>()) {
if (auto dyldAspect = aspect<UseDyldSuffixAspect>()) {
if (dyldAspect->value())
env.set("DYLD_IMAGE_SUFFIX", "_debug");
}
bool usingLibraryPaths = extraAspect<UseLibraryPathsAspect>()->value();
bool usingLibraryPaths = aspect<UseLibraryPathsAspect>()->value();
const auto key = qMakePair(env.toStringList(), usingLibraryPaths);
const auto it = m_envCache.constFind(key);
@@ -146,16 +146,16 @@ void QbsRunConfiguration::updateTargetInformation()
{
BuildTargetInfo bti = buildTargetInfo();
const FileName executable = executableToRun(bti);
auto terminalAspect = extraAspect<TerminalAspect>();
auto terminalAspect = aspect<TerminalAspect>();
if (!terminalAspect->isUserSet())
terminalAspect->setUseTerminal(bti.usesTerminal);
extraAspect<ExecutableAspect>()->setExecutable(executable);
aspect<ExecutableAspect>()->setExecutable(executable);
if (!executable.isEmpty()) {
QString defaultWorkingDir = QFileInfo(executable.toString()).absolutePath();
if (!defaultWorkingDir.isEmpty()) {
auto wdAspect = extraAspect<WorkingDirectoryAspect>();
auto wdAspect = aspect<WorkingDirectoryAspect>();
wdAspect->setDefaultWorkingDirectory(FileName::fromString(defaultWorkingDir));
}
}