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

Qbs: Adapt to the latest round of API changes in Qbs

Browse Source 
Change-Id: I59fd151a1a485990ca0da7dac4fdc028f915ec6b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-06-18 12:06:11 +02:00
parent e11ee89916
commit a1921d91f4
9 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -378,13 +378,13 @@ bool QbsProject::fromMap(const QVariantMap &map)
return true;
}
void QbsProject::generateErrors(const qbs::Error &e)
void QbsProject::generateErrors(const qbs::ErrorInfo &e)
{
foreach (const qbs::ErrorData &data, e.entries())
foreach (const qbs::ErrorItem &item, e.items())
taskHub()->addTask(ProjectExplorer::Task(ProjectExplorer::Task::Error,
data.description(),
Utils::FileName::fromString(data.codeLocation().fileName()),
data.codeLocation().line(),
item.description(),
Utils::FileName::fromString(item.codeLocation().fileName()),
item.codeLocation().line(),
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
}
@@ -394,8 +394,8 @@ void QbsProject::parse(const QVariantMap &config, const Utils::Environment &env,
qbs::SetupProjectParameters params;
params.setBuildConfiguration(config);
qbs::Error err = params.expandBuildConfiguration(m_manager->settings());
if (!err.entries().isEmpty()) {
qbs::ErrorInfo err = params.expandBuildConfiguration(m_manager->settings());
if (!err.hasError()) {
generateErrors(err);
return;
}