diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-11-18 20:01:38 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2018-11-19 09:55:30 +0000 |
| commit | 406371cd5326378bab51cba9eaccadbb68a031c4 (patch) | |
| tree | da0088da5bcb637d10989719268dd291bf40f936 /src/libs/utils/settingsaccessor.cpp | |
| parent | b8156fdfe0e887d720168ef21a54e82df7198bfe (diff) | |
SettingsAccessor: Avoid soft assertion for inexistent file
abi.xml is optional, but if it is not found, some assertions are triggered.
Change-Id: I5255d6070028605cf860eb38ff63d00743a476d9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
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 998e78e58c..662ad4bd43 100644 --- a/src/libs/utils/settingsaccessor.cpp +++ b/src/libs/utils/settingsaccessor.cpp @@ -507,7 +507,7 @@ VersionUpgrader *UpgradingSettingsAccessor::upgrader(const int version) const SettingsAccessor::RestoreData UpgradingSettingsAccessor::upgradeSettings(const RestoreData &data, const int targetVersion) const { - if (data.hasError()) + if (data.hasError() || data.data.isEmpty()) return data; QTC_ASSERT(targetVersion >= firstSupportedVersion(), return data); |