diff options
author | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2009-08-13 14:07:52 (GMT) |
---|---|---|
committer | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2009-08-13 14:07:52 (GMT) |
commit | 9727a71ea077658148e963bc8510269b08095023 (patch) | |
tree | 19496c910f5adf78c24902ef7816becfbe7a80b0 /src/scripttools | |
parent | 04ac768f2ac5e3800893370c13c261a075a723ff (diff) | |
download | Qt-9727a71ea077658148e963bc8510269b08095023.zip Qt-9727a71ea077658148e963bc8510269b08095023.tar.gz Qt-9727a71ea077658148e963bc8510269b08095023.tar.bz2 |
Build fix.
Dependency on JSC from ScriptTools removed
Reviewed-by: Kent Hansen
Diffstat (limited to 'src/scripttools')
-rw-r--r-- | src/scripttools/debugging/qscriptdebuggeragent.cpp | 3 | ||||
-rw-r--r-- | src/scripttools/debugging/qscriptdebuggeragent_p.h | 1 | ||||
-rw-r--r-- | src/scripttools/debugging/qscriptdebuggeragent_p_p.h | 4 | ||||
-rw-r--r-- | src/scripttools/scripttools.pro | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggeragent.cpp b/src/scripttools/debugging/qscriptdebuggeragent.cpp index a263f8a..492b79f 100644 --- a/src/scripttools/debugging/qscriptdebuggeragent.cpp +++ b/src/scripttools/debugging/qscriptdebuggeragent.cpp @@ -88,7 +88,7 @@ QScriptDebuggerAgentPrivate *QScriptDebuggerAgentPrivate::get( */ QScriptDebuggerAgent::QScriptDebuggerAgent( QScriptDebuggerBackendPrivate *backend, QScriptEngine *engine) - : QScriptEngineAgent(*new QScriptDebuggerAgentPrivate, engine) + : QScriptEngineAgent(engine), d_ptr(new QScriptDebuggerAgentPrivate()) { Q_D(QScriptDebuggerAgent); d->backend = backend; @@ -110,6 +110,7 @@ QScriptDebuggerAgent::~QScriptDebuggerAgent() Q_D(QScriptDebuggerAgent); if (d->backend) d->backend->agentDestroyed(this); + delete d; } /*! diff --git a/src/scripttools/debugging/qscriptdebuggeragent_p.h b/src/scripttools/debugging/qscriptdebuggeragent_p.h index da06726..805efc1 100644 --- a/src/scripttools/debugging/qscriptdebuggeragent_p.h +++ b/src/scripttools/debugging/qscriptdebuggeragent_p.h @@ -125,6 +125,7 @@ public: const QVariant &argument = QVariant()); private: + QScriptDebuggerAgentPrivate *d_ptr; Q_DECLARE_PRIVATE(QScriptDebuggerAgent) Q_DISABLE_COPY(QScriptDebuggerAgent) }; diff --git a/src/scripttools/debugging/qscriptdebuggeragent_p_p.h b/src/scripttools/debugging/qscriptdebuggeragent_p_p.h index 7c229a4..09d0121 100644 --- a/src/scripttools/debugging/qscriptdebuggeragent_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggeragent_p_p.h @@ -53,8 +53,6 @@ // We mean it. // -#include <private/qscriptengineagent_p.h> - #include <QtScript/qscriptvalue.h> #include <QtCore/qdatetime.h> #include <QtCore/qhash.h> @@ -68,9 +66,7 @@ QT_BEGIN_NAMESPACE class QScriptDebuggerAgent; class QScriptDebuggerAgentPrivate - : public QScriptEngineAgentPrivate { - Q_DECLARE_PUBLIC(QScriptDebuggerAgent) public: enum State { NoState, diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro index 95af0e3..0ba5948 100644 --- a/src/scripttools/scripttools.pro +++ b/src/scripttools/scripttools.pro @@ -8,6 +8,6 @@ DEFINES += QT_NO_USING_NAMESPACE unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript include(../qbase.pri) -include(../script/webkit.pri) + include(debugging/debugging.pri) |