Merge remote-tracking branch 'origin/4.10'

 Conflicts:
	src/plugins/debugger/cdb/cdbengine.cpp

Change-Id: Idcfd19292730d2b0e67816715f7aa2cc0eb71c48

2 files changed, 7 insertions, 13 deletions

diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 95935cc514..b4314d355e 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -295,12 +295,9 @@ QString CdbEngine::extensionLibraryName(bool is64Bit)
     return rc;
 }
 
-int CdbEngine::elapsedLogTime() const
+int CdbEngine::elapsedLogTime()
 {
-    const int elapsed = m_logTime.elapsed();
-    const int delta = elapsed - m_elapsedLogTime;
-    m_elapsedLogTime = elapsed;
-    return delta;
+    return m_logTimer.restart();
 }
 
 void CdbEngine::createFullBacktrace()
@@ -323,8 +320,8 @@ void CdbEngine::setupEngine()
         qDebug(">setupEngine");
 
     init();
-    if (!m_logTime.elapsed())
-        m_logTime.start();
+    if (!m_logTimer.elapsed())
+        m_logTimer.start();
 
     // Console: Launch the stub with the suspended application and attach to it
     // CDB in theory has a command line option '-2' that launches a
diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h
index 29f7ccc4d6..1c454d6d51 100644
--- a/src/plugins/debugger/cdb/cdbengine.h
+++ b/src/plugins/debugger/cdb/cdbengine.h
@@ -32,14 +32,12 @@
 
 #include <projectexplorer/devicesupport/idevice.h>
 
-#include <QTime>
+#include <QElapsedTimer>
 
 namespace Debugger {
 namespace Internal {
 
 class CdbCommand;
-struct MemoryViewCookie;
-class StringInputStream;
 
 class CdbEngine : public CppDebuggerEngine
 {
@@ -195,7 +193,7 @@ private:
     NormalizedSourceFileName sourceMapNormalizeFileNameFromDebugger(const QString &f);
     void doUpdateLocals(const UpdateParameters &params) override;
     void updateAll() override;
-    int elapsedLogTime() const;
+    int elapsedLogTime();
     unsigned parseStackTrace(const GdbMi &data, bool sourceStepInto);
     void mergeStartParametersSourcePathMap();
 
@@ -223,8 +221,7 @@ private:
         wow64Stack32Bit,
         wow64Stack64Bit
     } m_wow64State = wow64Uninitialized;
-    QTime m_logTime;
-    mutable int m_elapsedLogTime = 0;
+    QElapsedTimer m_logTimer;
     QString m_extensionMessageBuffer;
     bool m_sourceStepInto = false;
     int m_watchPointX = 0;