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

Qbs: Do not clean compiler issues when reparsing

Browse Source 
Task-number: QTCREATORBUG-9979

Change-Id: If66146a6a5764b916470426e094c9f3f617ef2cd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2013-08-19 15:50:14 +02:00
parent d468f072cf
commit c821e7c5ed
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -384,9 +384,6 @@ void QbsProject::parse(const QVariantMap &config, const Utils::Environment &env,
{ {
QTC_ASSERT(!dir.isNull(), return); QTC_ASSERT(!dir.isNull(), return);
// Clear buildsystem related tasks:
ProjectExplorer::TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
qbs::SetupProjectParameters params; qbs::SetupProjectParameters params;
params.setBuildConfiguration(config); params.setBuildConfiguration(config);
qbs::ErrorInfo err = params.expandBuildConfiguration(m_manager->settings()); qbs::ErrorInfo err = params.expandBuildConfiguration(m_manager->settings());
@@ -443,7 +440,7 @@ void QbsProject::prepareForParsing()
{ {
m_forceParsing = false; m_forceParsing = false;
ProjectExplorer::TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE); ProjectExplorer::TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
if (m_qbsUpdateFutureInterface) if (m_qbsUpdateFutureInterface)
m_qbsUpdateFutureInterface->reportCanceled(); m_qbsUpdateFutureInterface->reportCanceled();
delete m_qbsUpdateFutureInterface; delete m_qbsUpdateFutureInterface;