Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/projectexplorer/compileoutputwindow.cpp
	src/plugins/projectexplorer/compileoutputwindow.h
	src/plugins/projectexplorer/outputwindow.cpp
	src/plugins/projectexplorer/outputwindow.h

1 files changed, 5 insertions, 2 deletions

diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 8a3e42393f..3b18945b1a 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -63,9 +63,9 @@
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
 
-static inline QString msgProgress(int n, int total)
+static inline QString msgProgress(int progress, int total)
 {
-    return BuildManager::tr("Finished %1 of %n build steps", 0, n).arg(total);
+    return BuildManager::tr("Finished %1 of %n build steps", 0, total).arg(progress);
 }
 
 BuildManager::BuildManager(ProjectExplorerPlugin *parent)
@@ -102,6 +102,9 @@ BuildManager::BuildManager(ProjectExplorerPlugin *parent)
     connect(m_taskWindow, SIGNAL(tasksChanged()),
             this, SLOT(updateTaskCount()));
 
+    connect(m_taskWindow, SIGNAL(tasksCleared()),
+            this,SIGNAL(tasksCleared()));
+
     connect(&m_progressWatcher, SIGNAL(canceled()),
             this, SLOT(cancel()));
     connect(&m_progressWatcher, SIGNAL(finished()),