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

CMake: fix Ninja's decreasing progress report

Browse Source 
Ninja should report completed against overall edges,
this way 100% would only be reached when ninja exits.

Task-number: QTCREATORBUG-10332
Change-Id: I90804db566662b2a96f9ce85b7fab5e1455831c7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Peter Kümmel
2013-11-15 10:22:03 +01:00
committed by Daniel Teske
parent 51d91a6075
commit f270f9758a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,7 @@ void MakeStep::ctor()
{
m_percentProgress = QRegExp(QLatin1String("^\\[\\s*(\\d*)%\\]"));
m_ninjaProgress = QRegExp(QLatin1String("^\\[\\s*(\\d*)/\\s*(\\d*)"));
m_ninjaProgressString = QLatin1String("[%s/%t "); // ninja: [33/100
m_ninjaProgressString = QLatin1String("[%f/%t "); // ninja: [33/100
//: Default display name for the cmake make step.
setDefaultDisplayName(tr("Make"));