From eb67ab31e7112b3ca49a34ead5707b33f9a237a4 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 22 Jul 2019 15:29:04 +0200
Subject: [PATCH] ExtensionSystem: Remove one deprecated use of QTime

Change-Id: I6bb4657127fdc1d79631059d26a1e35672af87e4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/libs/extensionsystem/pluginmanager.cpp | 17 ++++++++---------
 src/libs/extensionsystem/pluginmanager_p.h |  9 +++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index 6fbda8e4ec9..2a020a384d7 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -31,20 +31,19 @@
 #include "iplugin.h"
 
 #include <QCoreApplication>
-#include <QEventLoop>
 #include <QDateTime>
+#include <QDebug>
 #include <QDir>
+#include <QEventLoop>
 #include <QFile>
 #include <QLibrary>
 #include <QLibraryInfo>
 #include <QMetaProperty>
 #include <QSettings>
-#include <QTextStream>
-#include <QTime>
-#include <QWriteLocker>
-#include <QDebug>
-#include <QTimer>
 #include <QSysInfo>
+#include <QTextStream>
+#include <QTimer>
+#include <QWriteLocker>
 
 #include <utils/algorithm.h>
 #include <utils/benchmarker.h>
@@ -1174,7 +1173,7 @@ void PluginManagerPrivate::addObject(QObject *obj)
         if (m_profilingVerbosity && !m_profileTimer.isNull()) {
             // Report a timestamp when adding an object. Useful for profiling
             // its initialization time.
-            const int absoluteElapsedMS = m_profileTimer->elapsed();
+            const int absoluteElapsedMS = int(m_profileTimer->elapsed());
             qDebug("  %-43s %8dms", obj->metaObject()->className(), absoluteElapsedMS);
         }
 
@@ -1517,7 +1516,7 @@ PluginSpec *PluginManagerPrivate::pluginByName(const QString &name) const
 void PluginManagerPrivate::initProfiling()
 {
     if (m_profileTimer.isNull()) {
-        m_profileTimer.reset(new QTime);
+        m_profileTimer.reset(new QElapsedTimer);
         m_profileTimer->start();
         m_profileElapsedMS = 0;
         qDebug("Profiling started");
@@ -1529,7 +1528,7 @@ void PluginManagerPrivate::initProfiling()
 void PluginManagerPrivate::profilingReport(const char *what, const PluginSpec *spec /* = 0 */)
 {
     if (!m_profileTimer.isNull()) {
-        const int absoluteElapsedMS = m_profileTimer->elapsed();
+        const int absoluteElapsedMS = int(m_profileTimer->elapsed());
         const int elapsedMS = absoluteElapsedMS - m_profileElapsedMS;
         m_profileElapsedMS = absoluteElapsedMS;
         if (spec)
diff --git a/src/libs/extensionsystem/pluginmanager_p.h b/src/libs/extensionsystem/pluginmanager_p.h
index d67ce28c113..95fba4414ad 100644
--- a/src/libs/extensionsystem/pluginmanager_p.h
+++ b/src/libs/extensionsystem/pluginmanager_p.h
@@ -29,11 +29,12 @@
 
 #include <utils/algorithm.h>
 
+#include <QElapsedTimer>
+#include <QObject>
+#include <QReadWriteLock>
+#include <QScopedPointer>
 #include <QSet>
 #include <QStringList>
-#include <QObject>
-#include <QScopedPointer>
-#include <QReadWriteLock>
 
 #include <queue>
 
@@ -117,7 +118,7 @@ public:
     QEventLoop *shutdownEventLoop = nullptr; // used for async shutdown
 
     QStringList arguments;
-    QScopedPointer<QTime> m_profileTimer;
+    QScopedPointer<QElapsedTimer> m_profileTimer;
     QHash<const PluginSpec *, int> m_profileTotal;
     int m_profileElapsedMS = 0;
     unsigned m_profilingVerbosity = 0;