diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-03-04 08:15:50 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-03-04 08:15:50 +0100 |
| commit | 995ba78fae1faafdf76bf1449a593342896a4845 (patch) | |
| tree | 5ebec6505595d0c28d3a0374abb1310efca003dc /src/plugins/cpptools | |
| parent | 3bb44dc1c34e27e83790bfbcf219d24424f939ee (diff) | |
| parent | 6959618d7b2d9efc8f5f668489523d1833d4b396 (diff) | |
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
Diffstat (limited to 'src/plugins/cpptools')
| -rw-r--r-- | src/plugins/cpptools/builtinindexingsupport.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp index 484c3adcd5..9673a995f3 100644 --- a/src/plugins/cpptools/builtinindexingsupport.cpp +++ b/src/plugins/cpptools/builtinindexingsupport.cpp @@ -42,6 +42,7 @@ #include <cplusplus/LookupContext.h> #include <utils/qtcassert.h> #include <utils/runextensions.h> +#include <utils/stringutils.h> #include <utils/temporarydirectory.h> #include <QCoreApplication> @@ -173,9 +174,8 @@ void indexFindErrors(QFutureInterface<void> &indexingFuture, indexingFuture.setProgressValue(files.size() - (files.size() - (i + 1))); } - const QTime format = QTime(0, 0, 0, 0).addMSecs(timer.elapsed() + 500); - const QString time = format.toString(QLatin1String("hh:mm:ss")); - qDebug("FindErrorsIndexing: Finished after %s.", qPrintable(time)); + const QString elapsedTime = Utils::formatElapsedTime(timer.elapsed()); + qDebug("FindErrorsIndexing: %s", qPrintable(elapsedTime)); } void index(QFutureInterface<void> &indexingFuture, |