1 files changed, 8 insertions, 24 deletions
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 5bbe39719c..fd38502e1f 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -54,9 +54,6 @@ enum { debug = 0 };
 
 const int ConnectionWaitTimeMs = 5000;
 
-QmlEngine *createQmlEngine(const DebuggerStartParameters &,
-    DebuggerEngine *masterEngine);
-
 DebuggerEngine *createQmlCppEngine(const DebuggerStartParameters &sp,
                                    QString *errorMessage)
 {
@@ -74,32 +71,17 @@ DebuggerEngine *createQmlCppEngine(const DebuggerStartParameters &sp,
 //
 ////////////////////////////////////////////////////////////////////////
 
-class QmlCppEnginePrivate : public QObject
+class QmlCppEnginePrivate
 {
-    Q_OBJECT
-
 public:
-    QmlCppEnginePrivate(QmlCppEngine *parent,
-            const DebuggerStartParameters &sp);
-    ~QmlCppEnginePrivate() {}
+    QmlCppEnginePrivate() {}
 
-private:
-    friend class QmlCppEngine;
-    QmlCppEngine *q;
     QmlEngine *m_qmlEngine;
     DebuggerEngine *m_cppEngine;
     DebuggerEngine *m_activeEngine;
 };
 
 
-QmlCppEnginePrivate::QmlCppEnginePrivate(QmlCppEngine *parent,
-        const DebuggerStartParameters &sp)
-    : q(parent), m_qmlEngine(createQmlEngine(sp, q)),
-      m_cppEngine(0), m_activeEngine(0)
-{
-    setObjectName(QLatin1String("QmlCppEnginePrivate"));
-}
-
 ////////////////////////////////////////////////////////////////////////
 //
 // QmlCppEngine
@@ -107,10 +89,14 @@ QmlCppEnginePrivate::QmlCppEnginePrivate(QmlCppEngine *parent,
 ////////////////////////////////////////////////////////////////////////
 
 QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp, QString *errorMessage)
-    : DebuggerEngine(sp), d(new QmlCppEnginePrivate(this, sp))
+    : DebuggerEngine(sp)
 {
     setObjectName(QLatin1String("QmlCppEngine"));
-    d->m_cppEngine = DebuggerRunControlFactory::createEngine(sp.firstSlaveEngineType, sp, this, errorMessage);
+    d = new QmlCppEnginePrivate;
+    d->m_qmlEngine = new QmlEngine(sp);
+    d->m_qmlEngine->setMasterEngine(this);
+    d->m_cppEngine = DebuggerRunControlFactory::createEngine(sp.firstSlaveEngineType, sp, errorMessage);
+    d->m_cppEngine->setMasterEngine(this);
     if (!d->m_cppEngine) {
         *errorMessage = tr("The slave debugging engine required for combined QML/C++-Debugging could not be created: %1").arg(*errorMessage);
         return;
@@ -831,5 +817,3 @@ void QmlCppEngine::setActiveEngine(DebuggerEngine *engine)
 
 } // namespace Internal
 } // namespace Debugger
-
-#include "qmlcppengine.moc"