Commit f270f975 authored by Peter Kümmel's avatar Peter Kümmel Committed by Daniel Teske

CMake: fix Ninja's decreasing progress report

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: default avatarDaniel Teske <daniel.teske@digia.com>
parent 51d91a60
......@@ -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"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment