From 406371cd5326378bab51cba9eaccadbb68a031c4 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 18 Nov 2018 20:01:38 +0200
Subject: [PATCH] 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>
---
 src/libs/utils/settingsaccessor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp
index 998e78e58c8..662ad4bd430 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);