diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2013-11-15 10:22:03 +0100 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2013-11-25 18:27:57 +0100 |
| commit | f270f9758a9252af9c92f8c3ff94ea4776ced5b0 (patch) | |
| tree | 0fa95ba8b59f03427291e8ad7abf13c23640ffa2 /src/plugins/cmakeprojectmanager | |
| parent | 51d91a6075164f4168c06db3e53fc04e1dd3eb8e (diff) | |
| download | qt-creator-f270f9758a9252af9c92f8c3ff94ea4776ced5b0.tar.gz | |
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: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/makestep.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp index 5059965132..59db213396 100644 --- a/src/plugins/cmakeprojectmanager/makestep.cpp +++ b/src/plugins/cmakeprojectmanager/makestep.cpp @@ -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")); |