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/qnx | |
| 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/qnx')
| -rw-r--r-- | src/plugins/qnx/qnxdebugsupport.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qnx/qnxrunconfiguration.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qnx/slog2inforunner.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp index bb69ba4647..f53b27df36 100644 --- a/src/plugins/qnx/qnxdebugsupport.cpp +++ b/src/plugins/qnx/qnxdebugsupport.cpp @@ -265,7 +265,7 @@ void QnxAttachDebugSupport::showProcessesDialog() // QString projectSourceDirectory = dlg.projectSource(); QString localExecutable = dlg.localExecutable(); if (localExecutable.isEmpty()) { - if (auto aspect = runConfig->extraAspect<SymbolFileAspect>()) + if (auto aspect = runConfig->aspect<SymbolFileAspect>()) localExecutable = aspect->fileName().toString(); } diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp index 73e619dbad..f9aa3b93fc 100644 --- a/src/plugins/qnx/qnxrunconfiguration.cpp +++ b/src/plugins/qnx/qnxrunconfiguration.cpp @@ -45,7 +45,7 @@ QnxRunConfiguration::QnxRunConfiguration(Target *target, Core::Id id) Runnable QnxRunConfiguration::runnable() const { Runnable r = RemoteLinuxRunConfiguration::runnable(); - QString libPath = extraAspect<QtLibPathAspect>()->value(); + QString libPath = aspect<QtLibPathAspect>()->value(); if (!libPath.isEmpty()) { r.environment.appendOrSet("LD_LIBRARY_PATH", libPath + "/lib:$LD_LIBRARY_PATH"); r.environment.appendOrSet("QML_IMPORT_PATH", libPath + "/imports:$QML_IMPORT_PATH"); diff --git a/src/plugins/qnx/slog2inforunner.cpp b/src/plugins/qnx/slog2inforunner.cpp index e7648899a4..113d589a3c 100644 --- a/src/plugins/qnx/slog2inforunner.cpp +++ b/src/plugins/qnx/slog2inforunner.cpp @@ -45,7 +45,7 @@ Slog2InfoRunner::Slog2InfoRunner(RunControl *runControl) : RunWorker(runControl) { setId("Slog2InfoRunner"); - m_applicationId = runControl->runConfiguration()->extraAspect<ExecutableAspect>()->executable().fileName(); + m_applicationId = runControl->runConfiguration()->aspect<ExecutableAspect>()->executable().fileName(); // See QTCREATORBUG-10712 for details. // We need to limit length of ApplicationId to 63 otherwise it would not match one in slog2info. |