feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.10'

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

Change-Id: Idcfd19292730d2b0e67816715f7aa2cc0eb71c48
This commit is contained in:
Eike Ziller
2019-06-13 14:03:02 +02:00
parent 646c984ffa 0b2b21bb22
commit f3011f057c
69 changed files with 619 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -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