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

9
src/plugins/debugger/cdb/cdbengine.h
View File

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