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

4
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -305,7 +305,7 @@ Runnable QmlProjectRunConfiguration::runnable() const
Runnable r;
r.executable = executable();
r.commandLineArguments = commandLineArguments();
r.environment = extraAspect<QmlProjectEnvironmentAspect>()->environment();
r.environment = aspect<QmlProjectEnvironmentAspect>()->environment();
r.workingDirectory = static_cast<QmlProject *>(project())->targetDirectory(target()).toString();
return r;
}
@@ -354,7 +354,7 @@ QString QmlProjectRunConfiguration::executable() const
QString QmlProjectRunConfiguration::commandLineArguments() const
{
// arguments in .user file
QString args = extraAspect<ArgumentsAspect>()->arguments(macroExpander());
QString args = aspect<ArgumentsAspect>()->arguments(macroExpander());
const Target *currentTarget = target();
const IDevice::ConstPtr device = DeviceKitInformation::device(currentTarget->kit());
const Utils::OsType osType = device ? device->osType() : Utils::HostOsInfo::hostOs();