Merge remote-tracking branch 'origin/4.15'

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

Change-Id: I403b236c40d73a61ae22304e289e9d4374366395

1 files changed, 4 insertions, 5 deletions

diff --git a/src/plugins/cpptools/stringtable.cpp b/src/plugins/cpptools/stringtable.cpp
index efd186fada..5122c3a8a9 100644
--- a/src/plugins/cpptools/stringtable.cpp
+++ b/src/plugins/cpptools/stringtable.cpp
@@ -28,10 +28,10 @@
 #include <utils/qtcassert.h>
 
 #include <QDebug>
+#include <QElapsedTimer>
 #include <QMutex>
 #include <QSet>
 #include <QThreadPool>
-#include <QTime>
 #include <QTimer>
 
 using namespace CppTools::Internal;
@@ -139,10 +139,10 @@ void StringTablePrivate::GC()
     QMutexLocker locker(&m_lock);
 
     int initialSize = 0;
-    QTime startTime;
+    QElapsedTimer timer;
     if (DebugStringTable) {
         initialSize = m_strings.size();
-        startTime = QTime::currentTime();
+        timer.start();
     }
 
     // Collect all QStrings which have refcount 1. (One reference in m_strings and nowhere else.)
@@ -159,7 +159,6 @@ void StringTablePrivate::GC()
     if (DebugStringTable) {
         const int currentSize = m_strings.size();
         qDebug() << "StringTable::GC removed" << initialSize - currentSize
-                 << "strings in" << startTime.msecsTo(QTime::currentTime())
-                 << "ms, size is now" << currentSize;
+                 << "strings in" << timer.elapsed() << "ms, size is now" << currentSize;
     }
 }