From fd04d6afa4d530fc06783a817aea9d724087aff6 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 23 Jun 2023 10:15:47 +0200 Subject: [PATCH] ProjectExplorer: always map working directory path to command device Change-Id: I0d2d54df118b70c2874b77b4ec2792fb8e114416 Reviewed-by: hjk --- src/plugins/projectexplorer/runconfiguration.cpp | 2 +- src/plugins/python/pythonrunconfiguration.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 29b59ad8984..a38b8dfae05 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -400,7 +400,7 @@ Runnable RunConfiguration::runnable() const Runnable r; r.command = commandLine(); if (auto workingDirectoryAspect = aspect()) - r.workingDirectory = r.command.executable().withNewPath(workingDirectoryAspect->workingDirectory().path()); + r.workingDirectory = r.command.executable().withNewMappedPath(workingDirectoryAspect->workingDirectory()); if (auto environmentAspect = aspect()) r.environment = environmentAspect->environment(); if (m_runnableModifier) diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp index 42cd8a8e9ae..998a829bc91 100644 --- a/src/plugins/python/pythonrunconfiguration.cpp +++ b/src/plugins/python/pythonrunconfiguration.cpp @@ -226,10 +226,6 @@ PythonRunConfiguration::PythonRunConfiguration(Target *target, Id id) connect(target, &Target::buildSystemUpdated, this, [this]() { d->updateExtraCompilers(); }); currentInterpreterChanged(); - setRunnableModifier([](Runnable &r) { - r.workingDirectory = r.command.executable().withNewMappedPath(r.workingDirectory); // FIXME: Needed? - }); - connect(PySideInstaller::instance(), &PySideInstaller::pySideInstalled, this, [this](const FilePath &python) { if (python == aspect()->currentInterpreter().command)