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

SettingsAccessor: Avoid soft assertion for inexistent file

Browse Source 
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>
This commit is contained in:
Orgad Shaneh
2018-11-18 20:01:38 +02:00
committed by Orgad Shaneh
parent b8156fdfe0
commit 406371cd53
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/settingsaccessor.cpp
View File

@@ -507,7 +507,7 @@ VersionUpgrader *UpgradingSettingsAccessor::upgrader(const int version) const
SettingsAccessor::RestoreData SettingsAccessor::RestoreData
UpgradingSettingsAccessor::upgradeSettings(const RestoreData &data, const int targetVersion) const UpgradingSettingsAccessor::upgradeSettings(const RestoreData &data, const int targetVersion) const
{ {
if (data.hasError()) if (data.hasError() || data.data.isEmpty())
return data; return data;
QTC_ASSERT(targetVersion >= firstSupportedVersion(), return data); QTC_ASSERT(targetVersion >= firstSupportedVersion(), return data);