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

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370
This commit is contained in:
Eike Ziller
2013-04-08 13:26:37 +02:00
parent 2d2a89941c bb13b8d65e
commit 65654e4a50
113 changed files with 5845 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/watchwindow.cpp
View File

@@ -398,7 +398,6 @@ static void addVariableMemoryView(DebuggerEngine *engine, bool separateView,
static void addStackLayoutMemoryView(DebuggerEngine *engine, bool separateView,
const QAbstractItemModel *m, const QPoint &p, QWidget *parent)
{
typedef QPair<quint64, QString> RegisterValueNamePair;
QTC_ASSERT(engine && m, return);
// Determine suitable address range from locals.