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

QmlJSInspector: Set property values

Browse Source 
QML property values could be set in the inspector.
Regression introduced by 7f09d0b756.
This patch is a partial fix. Only values can be assigned currently.
For expressions, use the console.

Change-Id: I945b11109cd7788dd0f5277af206bf9658844aee
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Aurindam Jana
2012-05-23 14:55:48 +02:00
parent 023deff474
commit a79e38ac6f
6 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1139,12 +1139,13 @@ Qt::ItemFlags WatchModel::flags(const QModelIndex &idx) const
= Qt::ItemIsSelectable | Qt::ItemIsEnabled;
static const Qt::ItemFlags editable = notEditable | Qt::ItemIsEditable;
// Disable editing if debuggee is positively running.
// Disable editing if debuggee is positively running except for Inspector data
const WatchData &data = *watchItem(idx);
const bool isRunning = engine() && engine()->state() == InferiorRunOk;
if (isRunning && engine() && !engine()->hasCapability(AddWatcherWhileRunningCapability))
if (isRunning && engine() && !engine()->hasCapability(AddWatcherWhileRunningCapability) &&
!data.isInspect())
return notEditable;
const WatchData &data = *watchItem(idx);
if (data.isWatcher()) {
if (idx.column() == 0 && data.iname.count('.') == 1)
return editable; // Watcher names are editable.
@@ -1159,6 +1160,9 @@ Qt::ItemFlags WatchModel::flags(const QModelIndex &idx) const
} else if (data.isLocal()) {
if (idx.column() == 1 && data.valueEditable)
return editable; // Locals values are sometimes editable.
} else if (data.isInspect()) {
if (idx.column() == 1 && data.valueEditable)
return editable; // Inspector values are sometimes editable.
}
return notEditable;
}