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

Android: Preserve settings on upgrading the qt sdk on windows

Browse Source 
Only override a setting from the sdk provided settings file if the
sdk settings file contains the setting.

Change-Id: I29a0f88d5075bfe432eb89c90fb959ef984e17b6
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2014-12-16 15:50:02 +01:00
parent 113bdf11ed
commit 4eecf47903
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/persistentsettings.cpp
View File

@@ -339,11 +339,11 @@ PersistentSettingsReader::PersistentSettingsReader()
{
}
QVariant PersistentSettingsReader::restoreValue(const QString &variable) const
QVariant PersistentSettingsReader::restoreValue(const QString &variable, const QVariant &defaultValue) const
{
if (m_valueMap.contains(variable))
return m_valueMap.value(variable);
return QVariant();
return defaultValue;
}
QVariantMap PersistentSettingsReader::restoreValues() const