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

Debugger: Read legacy settings from both SDK and user locations

Browse Source 
This fixes Boot2Qt setting the debugger for its kits.

Change-Id: I3ac3ad70b29b6c852e5e50d3e64258e487455b43
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Tobias Hunger
2013-10-29 14:06:55 +01:00
committed by hjk
parent b55f60b110
commit 22da799cf1
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/debugger/debuggeritemmanager.cpp
View File

@@ -243,11 +243,16 @@ void DebuggerItemManager::autoDetectGdbOrLldbDebuggers()
void DebuggerItemManager::readLegacyDebuggers() void DebuggerItemManager::readLegacyDebuggers()
{ {
QFileInfo settingsLocation(Core::ICore::settings()->fileName()); QFileInfo systemLocation(Core::ICore::settings(QSettings::SystemScope)->fileName());
FileName legacyKits = FileName::fromString(settingsLocation.absolutePath() + QLatin1String(DEBUGGER_LEGACY_FILENAME)); readLegacyDebuggers(FileName::fromString(systemLocation.absolutePath() + QLatin1String(DEBUGGER_LEGACY_FILENAME)));
QFileInfo userLocation(Core::ICore::settings()->fileName());
readLegacyDebuggers(FileName::fromString(userLocation.absolutePath() + QLatin1String(DEBUGGER_LEGACY_FILENAME)));
}
void DebuggerItemManager::readLegacyDebuggers(const FileName &file)
{
PersistentSettingsReader reader; PersistentSettingsReader reader;
if (!reader.load(legacyKits)) if (!reader.load(file))
return; return;
foreach (const QVariant &v, reader.restoreValues()) { foreach (const QVariant &v, reader.restoreValues()) {

1
src/plugins/debugger/debuggeritemmanager.h
View File

@@ -83,6 +83,7 @@ private:
static void autoDetectGdbOrLldbDebuggers(); static void autoDetectGdbOrLldbDebuggers();
static void autoDetectCdbDebuggers(); static void autoDetectCdbDebuggers();
static void readLegacyDebuggers(); static void readLegacyDebuggers();
static void readLegacyDebuggers(const Utils::FileName &file);
static Utils::PersistentSettingsWriter *m_writer; static Utils::PersistentSettingsWriter *m_writer;
static QList<DebuggerItem> m_debuggers; static QList<DebuggerItem> m_debuggers;