summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2020-02-13 18:38:23 +0100
committerhjk <hjk@qt.io>2020-02-14 15:50:16 +0000
commita7bd6864c174b7c453ef6ac9c2a5bb22b7b03edf (patch)
tree1b8bc023e03cf6b3c9f424c7bed5017155e1efe3
parent1f5a089f24f56ade1b8c29a0cf07699fc7fd8747 (diff)
downloadqt-creator-a7bd6864c174b7c453ef6ac9c2a5bb22b7b03edf.tar.gz
Qbs: Avoid a FilePath<->QString roundtrip in QbsInstallStep
Change-Id: I8366fc694ba899bf74e0fea8e85aa99e709a57b4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/plugins/qbsprojectmanager/qbsinstallstep.cpp8
-rw-r--r--src/plugins/qbsprojectmanager/qbsinstallstep.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
index ba98e6d2e7..1f414749bd 100644
--- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
@@ -182,7 +182,7 @@ void QbsInstallStep::installDone(const ErrorInfo &error)
m_session = nullptr;
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());
}
@@ -199,10 +199,10 @@ void QbsInstallStep::handleProgress(int value)
emit progress(value * 100 / m_maxProgress, m_description);
}
-void QbsInstallStep::createTaskAndOutput(ProjectExplorer::Task::TaskType type,
- const QString &message, const QString &file, int line)
+void QbsInstallStep::createTaskAndOutput(Task::TaskType type, const QString &message,
+ 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 addOutput(message, OutputFormat::Stdout);
}
diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h
index c02d2ab25f..9df1afaa7e 100644
--- a/src/plugins/qbsprojectmanager/qbsinstallstep.h
+++ b/src/plugins/qbsprojectmanager/qbsinstallstep.h
@@ -67,7 +67,7 @@ private:
void handleProgress(int value);
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 setDryRun(bool dr);