diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-10-22 17:11:36 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-10-30 19:05:00 +0000 |
commit | e1db5c660734bd8d43675469ce828944347e739b (patch) | |
tree | 8d48054be6fbcbe908b0f8dc1902301ef1c30611 /src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp | |
parent | be804f641f53305bb294205896a6cfa0cc080d19 (diff) |
Move V4 debugger and its test into better places
Now that we have an abstract base class we don't need to carry the
V4 debugger in QtQml anymore. The test clearly belongs into the
debugger category.
Change-Id: I0f71bdb331da8a568e43600363a0468299aa1a87
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp')
-rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp index 377f0845d0..e3347be14c 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp @@ -40,6 +40,7 @@ #include <private/qv4runtime_p.h> #include <QtCore/qjsonarray.h> +#include <QtCore/qjsonobject.h> QT_BEGIN_NAMESPACE @@ -208,13 +209,13 @@ QV4DataCollector::Ref QV4DataCollector::addScriptRef(const QString &scriptName) return ref; } -void QV4DataCollector::collectScope(QJsonObject *dict, QV4::Debugging::V4Debugger *debugger, - int frameNr, int scopeNr) +void QV4DataCollector::collectScope(QJsonObject *dict, QV4Debugger *debugger, int frameNr, + int scopeNr) { QStringList names; Refs refs; - if (debugger->state() == QV4::Debugging::V4Debugger::Paused) { + if (debugger->state() == QV4Debugger::Paused) { RefHolder holder(this, &refs); ArgumentCollectJob argumentsJob(m_engine, this, &names, frameNr, scopeNr); debugger->runInEngine(&argumentsJob); |