diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-09-23 13:22:08 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-09-23 13:22:08 +0200 |
commit | 13c97d652eb7985927bff2eb38d1f8c5ce226007 (patch) | |
tree | d4b42dfba92b8c862522d00ac68752c3a6a75056 /src/plugins/debugger/script/scriptengine.cpp | |
parent | d81d90a67ac34d169019e057f901ade3046f6ff3 (diff) | |
download | qt-creator-13c97d652eb7985927bff2eb38d1f8c5ce226007.tar.gz |
Debugger: Fixes around watch editing.
assignValueInDebugger: Pass on WatchData as well, pass
on values as QVariant. Based on that, do more extensive
checks in CDB, preventing assignment of non-PODs.
Locals/Watch editing:
* Disable while running
* Edit pointer values as hex with validation.
CDB: Strip class types off reported pointer values and reformat
the values as short 0x-pointer values, introduce flag to
WatchData::source to do dumper expansion handling.
Windows: recognize int64 as int.
Register handler: Fix accessing uninitialized value.
Diffstat (limited to 'src/plugins/debugger/script/scriptengine.cpp')
-rw-r--r-- | src/plugins/debugger/script/scriptengine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp index f5b36383bb..9fb2e337a2 100644 --- a/src/plugins/debugger/script/scriptengine.cpp +++ b/src/plugins/debugger/script/scriptengine.cpp @@ -581,11 +581,11 @@ void ScriptEngine::setToolTipExpression(const QPoint &mousePos, // ////////////////////////////////////////////////////////////////////// -void ScriptEngine::assignValueInDebugger(const QString &expression, - const QString &value) +void ScriptEngine::assignValueInDebugger(const Internal::WatchData *, + const QString &expression, const QVariant &value) { - SDEBUG("ASSIGNING: " << (expression + QLatin1Char('=') + value)); - m_scriptEngine->evaluate(expression + QLatin1Char('=') + value); + SDEBUG("ASSIGNING: " << (expression + QLatin1Char('=') + value.toString())); + m_scriptEngine->evaluate(expression + QLatin1Char('=') + value.toString()); updateLocals(); } |