diff options
| author | hjk <qtc-committer@nokia.com> | 2009-06-26 13:40:16 +0200 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-06-30 10:27:06 +0200 |
| commit | a6b928015d1242741e17aaffcf9ebf5f227c06ed (patch) | |
| tree | b88fbd21b68d9d5a8df90035adeed3e1f41d8d93 | |
| parent | 63587ff72ac7019fcc2f4c3cacc2c06af633fceb (diff) | |
| download | qt-creator-a6b928015d1242741e17aaffcf9ebf5f227c06ed.tar.gz | |
debugger: attempty to work around old ini files containing @Invalid() entries
| -rw-r--r-- | src/libs/utils/savedaction.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/libs/utils/savedaction.cpp b/src/libs/utils/savedaction.cpp index 7eea0711da..f0337c0bdd 100644 --- a/src/libs/utils/savedaction.cpp +++ b/src/libs/utils/savedaction.cpp @@ -243,8 +243,13 @@ void SavedAction::readSettings(QSettings *settings) if (m_settingsGroup.isEmpty() || m_settingsKey.isEmpty()) return; settings->beginGroup(m_settingsGroup); - setValue(settings->value(m_settingsKey, m_defaultValue), false); - //qDebug() << "READING: " << m_settingsKey << " -> " << m_value; + QVariant var = settings->value(m_settingsKey, m_defaultValue); + // work around old ini files containing @Invalid() entries + if (isCheckable() && !var.isValid()) + var = false; + setValue(var); + //qDebug() << "READING: " << var.isValid() << m_settingsKey << " -> " << m_value + // << " (default: " << m_defaultValue << ")" << var; settings->endGroup(); } |