diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2017-11-17 22:17:29 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2017-11-22 11:59:02 +0000 |
| commit | 6044b84e1411a76b12a422159ab255cc03b3b41f (patch) | |
| tree | b832dfcfc14def7f6b9dc7ccf6d0e866739adba5 /src/libs/utils/settingsaccessor.cpp | |
| parent | b8f2d746d0e7bf65d0b46baaffa0da57a38f9052 (diff) | |
SettingsAccessor: Add tests for findIssues
Change-Id: Ib78c2c93dc9404087efe485fdaaad69595aa0125
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/libs/utils/settingsaccessor.cpp')
| -rw-r--r-- | src/libs/utils/settingsaccessor.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp index 902511e1222..c2e328be375 100644 --- a/src/libs/utils/settingsaccessor.cpp +++ b/src/libs/utils/settingsaccessor.cpp @@ -394,6 +394,9 @@ SettingsAccessor::ProceedInfo SettingsAccessor::reportIssues(const QVariantMap & const FileName &path, QWidget *parent) const { + if (!path.exists()) + return Continue; + IssueInfo issue = findIssues(data, path); QMessageBox::Icon icon = QMessageBox::Information; @@ -429,9 +432,7 @@ SettingsAccessor::IssueInfo SettingsAccessor::findIssues(const QVariantMap &data const FileName defaultSettingsPath = userFilePath(d->m_baseFile, d->m_userSuffix); int version = versionFromMap(data); - if (!path.exists()) { - return result; - } else if (data.isEmpty() || version < firstSupportedVersion() || version > currentVersion()) { + if (data.isEmpty() || version < firstSupportedVersion() || version > currentVersion()) { result.title = QApplication::translate("Utils::SettingsAccessor", "No Valid Settings Found"); result.message = QApplication::translate("Utils::SettingsAccessor", "<p>No valid settings file could be found.</p>" |