JsExpander: Do not crash on exit

Change-Id: I55caca6dd5b316b2573b443175448d732101871c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

src/plugins/coreplugin/jsexpander.cpp

@@ -56,6 +56,7 @@ static Internal::JsExpanderPrivate *d;
 
 void JsExpander::registerQObjectForJs(const QString &name, QObject *obj)
 {
+    obj->setParent(0); // take ownership!
     d->m_registeredObjects.append(obj);
     QScriptValue jsObj = d->m_engine.newQObject(obj, QScriptEngine::QtOwnership);
     d->m_engine.globalObject().setProperty(name, jsObj);

src/plugins/cpptools/cpptoolsjsextension.h

@@ -45,7 +45,7 @@ class CppToolsJsExtension : public QObject
     Q_OBJECT
 
 public:
-    CppToolsJsExtension(QObject *parent) : QObject(parent) { }
+    CppToolsJsExtension(QObject *parent = 0) : QObject(parent) { }
 
     // Generate header guard:
     Q_INVOKABLE QString headerGuard(const QString &in) const;

src/plugins/cpptools/cpptoolsplugin.cpp

@@ -146,7 +146,7 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error)
         modelManager->updateSourceFiles(files.toSet());
     });
 
-    JsExpander::registerQObjectForJs(QLatin1String("Cpp"), new CppToolsJsExtension(this));
+    JsExpander::registerQObjectForJs(QLatin1String("Cpp"), new CppToolsJsExtension);
 
     CppLocatorData *locatorData = new CppLocatorData;
     connect(modelManager, SIGNAL(documentUpdated(CPlusPlus::Document::Ptr)),

src/plugins/qtsupport/qtsupportplugin.cpp

@@ -72,7 +72,7 @@ bool QtSupportPlugin::initialize(const QStringList &arguments, QString *errorMes
     if (!MimeDatabase::addMimeTypes(QLatin1String(":qtsupport/QtSupport.mimetypes.xml"), errorMessage))
         return false;
 
-    JsExpander::registerQObjectForJs(QLatin1String("QtSupport"), new CodeGenerator(this));
+    JsExpander::registerQObjectForJs(QLatin1String("QtSupport"), new CodeGenerator);
 
     addAutoReleasedObject(new QtVersionManager);
     addAutoReleasedObject(new DesktopQtVersionFactory);