feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: always map working directory path to command device

Browse Source 
Change-Id: I0d2d54df118b70c2874b77b4ec2792fb8e114416
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2023-06-23 10:15:47 +02:00
parent 4a17a26a6d
commit fd04d6afa4
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -400,7 +400,7 @@ Runnable RunConfiguration::runnable() const
Runnable r;
r.command = commandLine();
if (auto workingDirectoryAspect = aspect<WorkingDirectoryAspect>())
r.workingDirectory = r.command.executable().withNewPath(workingDirectoryAspect->workingDirectory().path());
r.workingDirectory = r.command.executable().withNewMappedPath(workingDirectoryAspect->workingDirectory());
if (auto environmentAspect = aspect<EnvironmentAspect>())
r.environment = environmentAspect->environment();
if (m_runnableModifier)

4
src/plugins/python/pythonrunconfiguration.cpp
View File

@@ -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<InterpreterAspect>()->currentInterpreter().command)