feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.4'

Browse Source
This commit is contained in:
Eike Ziller
2011-12-13 15:25:20 +01:00
parent 3fc2ae7a49 007330569b
commit 9a0636f7a9
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/help/helpviewer.cpp
View File

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

6
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -344,7 +344,11 @@ Qt4Project::~Qt4Project()
m_manager->unregisterProject(this); m_manager->unregisterProject(this);
delete m_projectFiles; delete m_projectFiles;
m_cancelEvaluate = true; 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() void Qt4Project::updateFileList()