Merge remote-tracking branch 'origin/2.4'

src/plugins/help/helpviewer.cpp

@@ -138,6 +138,7 @@ bool HelpViewer::launchWithExternalApp(const QUrl &url)
         if (!canOpenPage(path)) {
             Utils::TempFileSaver saver(QDir::tempPath()
                 + QLatin1String("/qtchelp_XXXXXX.") + QFileInfo(path).completeSuffix());
+            saver.setAutoRemove(false);
             if (!saver.hasError())
                 saver.write(helpEngine.fileData(resolvedUrl));
             if (saver.finalize(Core::ICore::instance()->mainWindow()))

src/plugins/qt4projectmanager/qt4project.cpp

@@ -344,7 +344,11 @@ Qt4Project::~Qt4Project()
     m_manager->unregisterProject(this);
     delete m_projectFiles;
     m_cancelEvaluate = true;
-    delete m_rootProjectNode;
+    // Deleting the root node triggers a few things, make sure rootProjectNode
+    // returns 0 already
+    Qt4ProFileNode *root = m_rootProjectNode;
+    m_rootProjectNode = 0;
+    delete root;
 }
 
 void Qt4Project::updateFileList()