Build fix.

Dependency on JSC from ScriptTools removed

Reviewed-by: Kent Hansen

4 files changed, 4 insertions, 6 deletions

diff --git a/src/scripttools/debugging/qscriptdebuggeragent.cpp b/src/scripttools/debugging/qscriptdebuggeragent.cpp
index a263f8a229..492b79fc19 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 da067265c3..805efc1423 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 7c229a42ef..09d01212f8 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 95af0e3d1d..0ba594852d 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)