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

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	src/plugins/valgrind/valgrindruncontrolfactory.cpp

Change-Id: I96c0f8cc3b49f8f55f45ef1f839857f878f532f4
This commit is contained in:
Eike Ziller
2016-05-18 12:12:46 +02:00
parent 37b25c38b4 ac9360a2c1
commit ec231b5910
12 changed files with 3466 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/watchhandler.cpp
View File

@@ -1448,7 +1448,7 @@ void WatchHandler::watchExpression(const QString &exp0, const QString &name)
item->setValue(QString(QLatin1Char(' ')));
item->update();
} else {
m_model->m_engine->updateItem(item->iname);
m_model->m_engine->updateWatchData(item->iname);
}
updateWatchersWindow();
}