diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2012-09-27 12:20:54 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2012-09-27 12:32:35 +0200 |
commit | 14bc65fdffe76a8e96c3ab32d6f08a7642eb55e1 (patch) | |
tree | 1e3374c665dc6a02133f0b0d4c3bfa003219deaa /src/plugins/qtsupport/qtversionmanager.cpp | |
parent | b1bb59aeff1717c82e74bc00cdfd82e21879bd12 (diff) | |
download | qt-creator-14bc65fdffe76a8e96c3ab32d6f08a7642eb55e1.tar.gz |
Revert "Make sure to never write kits/Qt/TCs before they were read"
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 5d253b3704378fefd11a05dc6e97d56296ccca5a.
Change-Id: Ib9912cda15294c28b9136f79675e0e5694788d5b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/qtsupport/qtversionmanager.cpp')
-rw-r--r-- | src/plugins/qtsupport/qtversionmanager.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index 93cf2eb3a0..81fa5b99b6 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -177,10 +177,6 @@ QtVersionManager *QtVersionManager::instance() bool QtVersionManager::restoreQtVersions() { - QTC_ASSERT(!m_writer, return false); - m_writer = new Utils::PersistentSettingsWriter(settingsFileName(QLatin1String(QTVERSION_FILENAME)), - QLatin1String("QtCreatorQtVersions")); - QList<QtVersionFactory *> factories = ExtensionSystem::PluginManager::getObjects<QtVersionFactory>(); Utils::PersistentSettingsReader reader; @@ -366,7 +362,8 @@ void QtVersionManager::updateFromInstaller(bool emitSignal) void QtVersionManager::saveQtVersions() { if (!m_writer) - return; + m_writer = new Utils::PersistentSettingsWriter(settingsFileName(QLatin1String(QTVERSION_FILENAME)), + QLatin1String("QtCreatorQtVersions")); QVariantMap data; data.insert(QLatin1String(QTVERSION_FILE_VERSION_KEY), 1); |