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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/bineditor/bineditorplugin.cpp
This commit is contained in:
con
2010-07-05 13:54:07 +02:00
parent d209bd72db 4245b4ab44
commit 6503099bec
13 changed files with 359 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggeragents.h
View File

@@ -58,11 +58,11 @@ public:
public slots:
// Called from Engine
void addLazyData(QObject *editorToken, quint64 addr, const QByteArray &data);
// Called from Editor
void fetchLazyData(Core::IEditor *, quint64 block, bool sync);
private:
Q_SLOT void createBinEditor(quint64 startAddr);
Q_SLOT void fetchLazyData(Core::IEditor *, quint64 block, bool sync);
Q_SLOT void provideNewRange(Core::IEditor *editor, quint64 address);
QList<QPointer<Core::IEditor> > m_editors;
QPointer<DebuggerEngine> m_engine;