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

CMake: Do not try to parse progress information lines

Browse Source 
The lines with "[x%] Building something" do not contain errors,
so there is no need to parse them (causing false positives to show
up).

Change-Id: Iee87deb73db9e82040cab5401b74c70be91e6191
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-03-11 11:02:43 +01:00
parent 38a051b6a4
commit 578c107a16
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -270,6 +270,7 @@ void CMakeBuildStep::stdOutput(const QString &line)
int percent = m_percentProgress.cap(1).toInt(&ok); int percent = m_percentProgress.cap(1).toInt(&ok);
if (ok) if (ok)
futureInterface()->setProgressValue(percent); futureInterface()->setProgressValue(percent);
return;
} else if (m_ninjaProgress.indexIn(line) != -1) { } else if (m_ninjaProgress.indexIn(line) != -1) {
m_useNinja = true; m_useNinja = true;
bool ok = false; bool ok = false;
@@ -281,6 +282,7 @@ void CMakeBuildStep::stdOutput(const QString &line)
futureInterface()->setProgressValue(percent); futureInterface()->setProgressValue(percent);
} }
} }
return;
} }
if (m_useNinja) if (m_useNinja)
AbstractProcessStep::stdError(line); AbstractProcessStep::stdError(line);