diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-12 17:36:29 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-12 17:36:29 +0100 |
| commit | 56aadc407d7becadec794e660ae7d7c20e820e0c (patch) | |
| tree | c9aad23933bc6b0c68406e64e359f57143ef54d8 /src/plugins/debugger/qml/qmlv8debuggerclient.cpp | |
| parent | 9926fc2ab12ccaa02b7f03b416c54cd58ef30b31 (diff) | |
| parent | 28971701fd4baa99f294d9393650b83c40754e18 (diff) | |
| download | qt-creator-56aadc407d7becadec794e660ae7d7c20e820e0c.tar.gz | |
Merge remote-tracking branch 'origin/3.3'
Conflicts:
src/plugins/debugger/watchhandler.cpp
src/plugins/projectexplorer/kitmodel.cpp
src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
src/shared/qbs
Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
Diffstat (limited to 'src/plugins/debugger/qml/qmlv8debuggerclient.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlv8debuggerclient.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp index 0e119956ca..67f1a59aed 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp +++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp @@ -127,7 +127,6 @@ public: QScriptValue parser; QScriptValue stringifier; - QStringList scriptSourceRequests; QHash<int, QString> evaluatingExpression; QHash<int, QByteArray> localsAndWatchers; @@ -952,6 +951,9 @@ void QmlV8DebuggerClient::executeDebuggerCommand(const QString &command) void QmlV8DebuggerClient::synchronizeWatchers(const QStringList &watchers) { SDEBUG(watchers); + if (d->engine->state() != InferiorStopOk) + return; + foreach (const QString &exp, watchers) { StackHandler *stackHandler = d->engine->stackHandler(); if (stackHandler->isContentsValid() && stackHandler->currentFrame().isUsable()) { |