Merge remote-tracking branch 'origin/4.0'

Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb
This commit is contained in:
Eike Ziller
2016-04-15 10:07:49 +02:00
193 changed files with 966 additions and 1553 deletions

View File

@@ -1039,6 +1039,8 @@ bool WatchModel::setData(const QModelIndex &idx, const QVariant &value, int role
m_engine->assignValueInDebugger(item, item->expression(), value);
break;
}
break;
case LocalsExpandedRole:
if (value.toBool()) {
// Should already have been triggered by fetchMore()