Merge remote-tracking branch 'origin/4.12'

 Conflicts:
	src/plugins/cmakeprojectmanager/tealeafreader.cpp
	src/plugins/cmakeprojectmanager/tealeafreader.h
	src/plugins/projectexplorer/miniprojecttargetselector.cpp

Change-Id: I88d85be3903f57a55fddb7901e771a4822db1b85

1 files changed, 3 insertions, 5 deletions

diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp
index a80acd6471..3932d5b440 100644
--- a/src/plugins/clangtools/clangtoolruncontrol.cpp
+++ b/src/plugins/clangtools/clangtoolruncontrol.cpp
@@ -61,6 +61,7 @@
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcprocess.h>
+#include <utils/stringutils.h>
 
 #include <QAction>
 #include <QLoggingCategory>
@@ -344,11 +345,8 @@ void ClangToolRunWorker::stop()
     reportStopped();
 
     // Print elapsed time since start
-    const QTime format = QTime(0, 0, 0, 0).addMSecs(m_elapsed.elapsed() + 500);
-    QString time = format.toString("h:mm:ss");
-    if (time.startsWith("0:"))
-        time.remove(0, 2); // Don't display zero hours
-    appendMessage(tr("Elapsed time: %1.") .arg(time), NormalMessageFormat);
+    const QString elapsedTime = Utils::formatElapsedTime(m_elapsed.elapsed());
+    appendMessage(elapsedTime, NormalMessageFormat);
 }
 
 void ClangToolRunWorker::analyzeNextFile()