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

Core: Use FilePath for ExternalTool working directory

Browse Source 
Change-Id: Ifd295c3bd07b79f146b84fc27c117f42ba9b793f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2021-09-27 13:53:21 +02:00
parent 3f7f867da5
commit 0aa3cc45b5
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/externaltool.cpp
View File

@@ -169,7 +169,7 @@ QString ExternalTool::input() const
return m_input;
}
QString ExternalTool::workingDirectory() const
FilePath ExternalTool::workingDirectory() const
{
return m_workingDirectory;
}
@@ -287,7 +287,7 @@ void ExternalTool::setInput(const QString &input)
}
void ExternalTool::setWorkingDirectory(const QString &workingDirectory)
void ExternalTool::setWorkingDirectory(const FilePath &workingDirectory)
{
m_workingDirectory = workingDirectory;
}
@@ -435,7 +435,7 @@ ExternalTool * ExternalTool::createFromXml(const QByteArray &xml, QString *error
reader.raiseError("only one <workingdirectory> element allowed");
break;
}
tool->m_workingDirectory = reader.readElementText();
tool->m_workingDirectory = FilePath::fromString(reader.readElementText());
} else if (reader.name() == QLatin1String(kBaseEnvironmentId)) {
if (tool->m_baseEnvironmentProviderId.isValid()) {
reader.raiseError("only one <baseEnvironmentId> element allowed");
@@ -526,7 +526,7 @@ bool ExternalTool::save(QString *errorMessage) const
if (!m_input.isEmpty())
out.writeTextElement(kInput, m_input);
if (!m_workingDirectory.isEmpty())
out.writeTextElement(kWorkingDirectory, m_workingDirectory);
out.writeTextElement(kWorkingDirectory, m_workingDirectory.toString());
if (m_baseEnvironmentProviderId.isValid())
out.writeTextElement(kBaseEnvironmentId, m_baseEnvironmentProviderId.toString());
if (!m_environment.isEmpty()) {