From 9053cd7515a47605738a2e418d62d94db445ec8b Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 8 Apr 2018 12:07:56 +0300
Subject: [PATCH] SettingsAccessor: Support user file without EnvironmentId

Let the users forge a user file without injecting their environment.

Task-number: QTCREATORBUG-20097
Change-Id: Ia481f0f6d7c704d26b5f7d0f985f38dd39027f95
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 d25a9ed6df1..ad9d3517fb8 100644
--- a/src/libs/utils/settingsaccessor.cpp
+++ b/src/libs/utils/settingsaccessor.cpp
@@ -538,7 +538,7 @@ bool SettingsAccessor::isValidVersionAndId(const int version, const QByteArray &
     const int lastVersion = currentVersion();
 
     return (version >= firstVersion && version <= lastVersion)
-            && ( id == requiredId || requiredId.isEmpty());
+            && (id.isEmpty() || requiredId.isEmpty() || id == requiredId);
 }
 
 /*!