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

Make sure to never write kits/Qt/TCs before they were read

Browse Source 
We should be save already, but let's be paranoid...

Change-Id: I925fb94f4cebe4c54e3419e18d307a999055ebbf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2012-09-26 17:06:53 +02:00
parent ff605d3fbf
commit e81cfa6e70
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/toolchainmanager.cpp
View File

@@ -39,6 +39,7 @@
#include <extensionsystem/pluginmanager.h>
#include <utils/persistentsettings.h>
#include <utils/qtcassert.h>
#include <QCoreApplication>
#include <QDir>
@@ -81,7 +82,6 @@ public:
QList<ToolChain *> &toolChains();
ToolChainManager *q;
bool m_initialized;
QMap<QString, Utils::FileName> m_abiToDebugger;
Utils::PersistentSettingsWriter *m_writer;
@@ -90,8 +90,7 @@ private:
};
ToolChainManagerPrivate::ToolChainManagerPrivate(ToolChainManager *parent)
: q(parent), m_initialized(false),
m_writer(new Utils::PersistentSettingsWriter(settingsFileName(QLatin1String(TOOLCHAIN_FILENAME)), QLatin1String("QtCreatorToolChains")))
: q(parent), m_writer(0)
{ }
ToolChainManagerPrivate::~ToolChainManagerPrivate()
@@ -99,10 +98,8 @@ ToolChainManagerPrivate::~ToolChainManagerPrivate()
QList<ToolChain *> &ToolChainManagerPrivate::toolChains()
{
if (!m_initialized) {
m_initialized = true;
if (!m_writer)
q->restoreToolChains();
}
return m_toolChains;
}
@@ -136,6 +133,10 @@ ToolChainManager::ToolChainManager(QObject *parent) :
void ToolChainManager::restoreToolChains()
{
QTC_ASSERT(!d->m_writer, return);
d->m_writer =
new Utils::PersistentSettingsWriter(settingsFileName(QLatin1String(TOOLCHAIN_FILENAME)), QLatin1String("QtCreatorToolChains"));
QList<ToolChain *> tcsToRegister;
QList<ToolChain *> tcsToCheck;