diff options
author | hjk <hjk@theqtcompany.com> | 2016-01-27 14:07:23 +0100 |
---|---|---|
committer | hjk <hjk@theqtcompany.com> | 2016-01-27 16:34:01 +0000 |
commit | f2012bca8f3d4f5617559dc3227c4cc412b4713e (patch) | |
tree | 56938d2a7461c388e0ecebb1b1d3bec0ed7ee477 /src/plugins/valgrind/valgrindruncontrolfactory.cpp | |
parent | 06a99af0f6ddb759cd90ebc6083749d92b667a1a (diff) | |
download | qt-creator-f2012bca8f3d4f5617559dc3227c4cc412b4713e.tar.gz |
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 <hjk@theqtcompany.com>
Diffstat (limited to 'src/plugins/valgrind/valgrindruncontrolfactory.cpp')
-rw-r--r-- | src/plugins/valgrind/valgrindruncontrolfactory.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/valgrind/valgrindruncontrolfactory.cpp b/src/plugins/valgrind/valgrindruncontrolfactory.cpp index c2cfc57ae3..af98c5dd1c 100644 --- a/src/plugins/valgrind/valgrindruncontrolfactory.cpp +++ b/src/plugins/valgrind/valgrindruncontrolfactory.cpp @@ -78,13 +78,11 @@ RunControl *ValgrindRunControlFactory::create(RunConfiguration *runConfiguration Utils::Environment environment; StandardRunnable runnable; AnalyzerConnection connection; - QString workingDirectory; Runnable rcRunnable = runConfiguration->runnable(); QTC_ASSERT(rcRunnable.is<StandardRunnable>(), return 0); auto stdRunnable = runConfiguration->runnable().as<StandardRunnable>(); if (device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) { environment = stdRunnable.environment; - workingDirectory = stdRunnable.workingDirectory; runnable.executable = stdRunnable.executable; runnable.commandLineArguments = stdRunnable.commandLineArguments; QTcpServer server; @@ -105,7 +103,6 @@ RunControl *ValgrindRunControlFactory::create(RunConfiguration *runConfiguration runControl->setConnection(connection); runControl->setLocalRunMode(localRunMode); runControl->setEnvironment(environment); - runControl->setWorkingDirectory(workingDirectory); return runControl; } |