diff options
| author | Aurindam Jana <aurindam.jana@nokia.com> | 2011-07-28 13:29:52 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-17 13:19:47 +0200 |
| commit | f9990c90e1c6d212b66017a0d6dd485b550b26c4 (patch) | |
| tree | 0d0ba02bc752b28e418a96c0c0e31748a29e6fe5 /src/declarative/qml | |
| parent | a1166e4146da86fe85d767982697f576ebe2f6a1 (diff) | |
Enable v8 debugging
Javascript v8 debugging service replaces the QScript debugging service.
Change-Id: I25eea00eed3959b84a8f412e4c3484296d62e27b
Reviewed-on: http://codereview.qt.nokia.com/2614
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 4 | ||||
| -rw-r--r-- | src/declarative/qml/v8/qv8debug_p.h | 1 | ||||
| -rw-r--r-- | src/declarative/qml/v8/qv8engine_p.h | 2 | ||||
| -rw-r--r-- | src/declarative/qml/v8/v8.pri | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index f7c81d399b..c61849a8ac 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -67,7 +67,7 @@ #include "private/qdeclarativenotifier_p.h" #include "private/qdeclarativedebugtrace_p.h" #include "private/qdeclarativeapplication_p.h" -#include "private/qjsdebugservice_p.h" +#include "private/qv8debugservice_p.h" #include <QtCore/qmetaobject.h> #include <QNetworkReply> @@ -451,7 +451,7 @@ void QDeclarativeEnginePrivate::init() QDeclarativeEngineDebugServer::isDebuggingEnabled()) { isDebugging = true; QDeclarativeEngineDebugServer::instance()->addEngine(q); - QJSDebugService::instance()->addEngine(q); + QV8DebugService::instance()->addEngine(q); } } diff --git a/src/declarative/qml/v8/qv8debug_p.h b/src/declarative/qml/v8/qv8debug_p.h new file mode 100644 index 0000000000..51208aac8e --- /dev/null +++ b/src/declarative/qml/v8/qv8debug_p.h @@ -0,0 +1 @@ +#include "../../../3rdparty/v8/include/v8-debug.h" diff --git a/src/declarative/qml/v8/qv8engine_p.h b/src/declarative/qml/v8/qv8engine_p.h index 22c3504565..b3cc02321c 100644 --- a/src/declarative/qml/v8/qv8engine_p.h +++ b/src/declarative/qml/v8/qv8engine_p.h @@ -460,6 +460,7 @@ protected: double qtDateTimeToJsDate(const QDateTime &dt); QDateTime qtDateTimeFromJsDate(double jsDate); + private: typedef QScriptIntrusiveList<QJSValuePrivate, &QJSValuePrivate::m_node> ValueList; ValueList m_values; @@ -467,6 +468,7 @@ private: ValueIteratorList m_valueIterators; Q_DISABLE_COPY(QV8Engine) + friend class QV8DebugService; }; // Allocate a new Persistent handle. *ALL* persistent handles in QML must be allocated diff --git a/src/declarative/qml/v8/v8.pri b/src/declarative/qml/v8/v8.pri index 97b3d679df..448d501b98 100644 --- a/src/declarative/qml/v8/v8.pri +++ b/src/declarative/qml/v8/v8.pri @@ -5,6 +5,7 @@ include(script.pri) HEADERS += \ $$PWD/qv8_p.h \ + $$PWD/qv8debug_p.h \ $$PWD/qv8stringwrapper_p.h \ $$PWD/qv8engine_p.h \ $$PWD/qhashedstring_p.h \ |