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

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

Browse Source 
This patch causes core dumps in my work-creator while it works fine
in my test creator. Revert till I find the reason for this.

This reverts commit 5d253b3704.

Change-Id: Ib9912cda15294c28b9136f79675e0e5694788d5b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2012-09-27 12:20:54 +02:00
parent b1bb59aeff
commit 14bc65fdff
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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