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

Qbs: Avoid a FilePath<->QString roundtrip in QbsInstallStep

Browse Source 
Change-Id: I8366fc694ba899bf74e0fea8e85aa99e709a57b4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-02-13 18:38:23 +01:00
parent 1f5a089f24
commit a7bd6864c1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qbsprojectmanager/qbsinstallstep.cpp
View File

@@ -182,7 +182,7 @@ void QbsInstallStep::installDone(const ErrorInfo &error)
m_session = nullptr; m_session = nullptr;
for (const ErrorInfoItem &item : error.items) for (const ErrorInfoItem &item : error.items)
createTaskAndOutput(Task::Error, item.description, item.filePath.toString(), item.line); createTaskAndOutput(Task::Error, item.description, item.filePath, item.line);
emit finished(!error.hasError()); emit finished(!error.hasError());
} }
@@ -199,10 +199,10 @@ void QbsInstallStep::handleProgress(int value)
emit progress(value * 100 / m_maxProgress, m_description); emit progress(value * 100 / m_maxProgress, m_description);
} }
void QbsInstallStep::createTaskAndOutput(ProjectExplorer::Task::TaskType type, void QbsInstallStep::createTaskAndOutput(Task::TaskType type, const QString &message,
const QString &message, const QString &file, int line) const Utils::FilePath &file, int line)
{ {
const CompileTask task(type, message, Utils::FilePath::fromString(file), line); const CompileTask task(type, message, file, line);
emit addTask(task, 1); emit addTask(task, 1);
emit addOutput(message, OutputFormat::Stdout); emit addOutput(message, OutputFormat::Stdout);
} }

2
src/plugins/qbsprojectmanager/qbsinstallstep.h
View File

@@ -67,7 +67,7 @@ private:
void handleProgress(int value); void handleProgress(int value);
void createTaskAndOutput(ProjectExplorer::Task::TaskType type, void createTaskAndOutput(ProjectExplorer::Task::TaskType type,
const QString &message, const QString &file, int line); const QString &message, const Utils::FilePath &file, int line);
void setRemoveFirst(bool rf); void setRemoveFirst(bool rf);
void setDryRun(bool dr); void setDryRun(bool dr);