From f2012bca8f3d4f5617559dc3227c4cc412b4713e Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 27 Jan 2016 14:07:23 +0100 Subject: Analyzer: Remove explicit working directory storage in run control Instead, use the one in its (Standard)Runnable. The change is mechanical except to the fallback to the project directory which was introduced in 8150209f to keep some compatibility with the previous setup of the Android runner which created and copied the fallback value around and ignored it in the end. Not producing the fallback value is less effort. Change-Id: Ie04da570f0f9fbc1d048f2eacaed522f7253afa3 Reviewed-by: hjk --- src/plugins/analyzerbase/analyzerruncontrol.cpp | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/plugins/analyzerbase/analyzerruncontrol.cpp') diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/analyzerbase/analyzerruncontrol.cpp index 93819b7d7d..b7769e8db9 100644 --- a/src/plugins/analyzerbase/analyzerruncontrol.cpp +++ b/src/plugins/analyzerbase/analyzerruncontrol.cpp @@ -52,14 +52,6 @@ AnalyzerRunControl::AnalyzerRunControl(RunConfiguration *runConfiguration, Core: { setIcon(Icons::ANALYZER_CONTROL_START); - if (runConfiguration) { - setDisplayName(runConfiguration->displayName()); - if (auto aspect = runConfiguration->extraAspect()) - m_workingDirectory = aspect->workingDirectory().toString(); - if (m_workingDirectory.isEmpty()) - m_workingDirectory = runConfiguration->target()->project()->projectDirectory().toString(); - } - connect(this, &AnalyzerRunControl::finished, this, &AnalyzerRunControl::runControlFinished); connect(AnalyzerManager::stopAction(), &QAction::triggered, @@ -88,11 +80,6 @@ void AnalyzerRunControl::runControlFinished() AnalyzerManager::handleToolFinished(); } -QString AnalyzerRunControl::workingDirectory() const -{ - return m_workingDirectory; -} - void AnalyzerRunControl::start() { AnalyzerManager::handleToolStarted(); @@ -118,9 +105,4 @@ bool AnalyzerRunControl::isRunning() const return m_isRunning; } -void AnalyzerRunControl::setWorkingDirectory(const QString &workingDirectory) -{ - m_workingDirectory = workingDirectory; -} - } // namespace Analyzer -- cgit v1.2.1