diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-04-13 10:54:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-04-13 10:54:42 +0200 |
| commit | 428fcb476ba2c5bbe1d16dfe437e510dafce1777 (patch) | |
| tree | 10b130ef79d87dd1339004857c8f1e31e29c3f95 /src/libs/utils/settingsaccessor.cpp | |
| parent | 9e29a32e1ab3af42a4d70984449ba33b3092a50b (diff) | |
| parent | f4594c922fe3ffcfaf715cf09622ba48c3d1d620 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/libs/utils/settingsaccessor.cpp
src/plugins/autotest/autotestplugin.cpp
src/plugins/git/gitclient.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.h
Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
Diffstat (limited to 'src/libs/utils/settingsaccessor.cpp')
| -rw-r--r-- | src/libs/utils/settingsaccessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp index fa359358db..0c41e20cbe 100644 --- a/src/libs/utils/settingsaccessor.cpp +++ b/src/libs/utils/settingsaccessor.cpp @@ -454,7 +454,7 @@ bool UpgradingSettingsAccessor::isValidVersionAndId(const int version, const QBy { return (version >= 0 && version >= firstSupportedVersion() && version <= currentVersion()) - && (id == m_id || m_id.isEmpty()); + && (id.isEmpty() || id == m_id || m_id.isEmpty()); } SettingsAccessor::RestoreData UpgradingSettingsAccessor::readData(const FileName &path, |