Qbs: Fix build after recent updates

Change-Id: Ieaa57dc1cf0ea60ed612caf10f8e8aa06e70a9ba

4 files changed, 16 insertions, 9 deletions

diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 59a67d0c26..ed452dcb55 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -128,8 +128,8 @@ void QbsBuildStep::run(QFutureInterface<bool> &fi)
             this, SLOT(handleProgress(int)));
     connect(m_job, SIGNAL(reportCommandDescription(QString,QString)),
             this, SLOT(handleCommandDescriptionReport(QString,QString)));
-    connect(m_job, SIGNAL(reportWarning(qbs::CodeLocation,QString)),
-            this, SLOT(handleWarningReport(qbs::CodeLocation,QString)));
+    connect(m_job, SIGNAL(reportWarning(qbs::Error)),
+            this, SLOT(handleWarningReport(qbs::Error)));
     connect(m_job, SIGNAL(reportProcessResult(qbs::ProcessResult)),
             this, SLOT(handleProcessResultReport(qbs::ProcessResult)));
 }
@@ -212,7 +212,8 @@ void QbsBuildStep::buildingDone(bool success)
 {
     // Report errors:
     foreach (const qbs::ErrorData &data, m_job->error().entries())
-        createTaskAndOutput(ProjectExplorer::Task::Error, data.description(), data.file(), data.line());
+        createTaskAndOutput(ProjectExplorer::Task::Error, data.description(),
+                            data.codeLocation().fileName, data.codeLocation().line);
 
     QTC_ASSERT(m_fi, return);
     m_fi->reportResult(success);
@@ -238,9 +239,12 @@ void QbsBuildStep::handleProgress(int value)
     m_fi->setProgressValue(m_progressBase + value);
 }
 
-void QbsBuildStep::handleWarningReport(const qbs::CodeLocation &location, const QString &message)
+void QbsBuildStep::handleWarningReport(const qbs::Error &error)
 {
-    createTaskAndOutput(ProjectExplorer::Task::Warning, message, location.fileName, location.line);
+    foreach (const qbs::ErrorData &data, error.entries()) {
+        createTaskAndOutput(ProjectExplorer::Task::Warning, data.description(),
+                            data.codeLocation().fileName, data.codeLocation().line);
+    }
 }
 
 void QbsBuildStep::handleCommandDescriptionReport(const QString &highlight, const QString &message)
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h
index e32bcc8083..f2eabb8944 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h
@@ -79,7 +79,7 @@ private slots:
     void buildingDone(bool success);
     void handleTaskStarted(const QString &desciption, int max);
     void handleProgress(int value);
-    void handleWarningReport(const qbs::CodeLocation &location, const QString &message);
+    void handleWarningReport(const qbs::Error &error);
     void handleCommandDescriptionReport(const QString &highlight, const QString &message);
     void handleProcessResultReport(const qbs::ProcessResult &result);
 
diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
index 64907c0772..aa3907a168 100644
--- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
@@ -178,8 +178,10 @@ QVariantMap QbsCleanStep::toMap() const
 void QbsCleanStep::cleaningDone(bool success)
 {
     // Report errors:
-    foreach (const qbs::ErrorData &data, m_job->error().entries())
-        createTaskAndOutput(ProjectExplorer::Task::Error, data.description(), data.file(), data.line());
+    foreach (const qbs::ErrorData &data, m_job->error().entries()) {
+        createTaskAndOutput(ProjectExplorer::Task::Error, data.description(),
+                            data.codeLocation().fileName, data.codeLocation().line);
+    }
 
     QTC_ASSERT(m_fi, return);
     m_fi->reportResult(success);
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 1223a9039f..1532335cba 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -371,7 +371,8 @@ void QbsProject::generateErrors(const qbs::Error &e)
     foreach (const qbs::ErrorData &data, e.entries())
         taskHub()->addTask(ProjectExplorer::Task(ProjectExplorer::Task::Error,
                                                  data.description(),
-                                                 Utils::FileName::fromString(data.file()), data.line(),
+                                                 Utils::FileName::fromString(data.codeLocation().fileName),
+                                                 data.codeLocation().line,
                                                  ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
 }