diff options
author | hjk <hjk@qt.io> | 2018-09-07 13:29:45 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2018-10-02 08:32:51 +0000 |
commit | 1c9410e353337052bb141cbe4f519012545d735d (patch) | |
tree | ca63b9174a8e8bdf0c6ee9aa26ae27454900a24e /src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | |
parent | 2f6c6b632c25f3d9adc79b8e971129cc2ee7c3ee (diff) | |
download | qt-creator-1c9410e353337052bb141cbe4f519012545d735d.tar.gz |
ProjectExplorer: Rename 'extraAspect' to 'aspect'
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>
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp')
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 8d99294c67..55e32ec508 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -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(); |