diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-04-08 12:07:56 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2018-04-09 09:32:13 +0000 |
| commit | 9053cd7515a47605738a2e418d62d94db445ec8b (patch) | |
| tree | 3e2e6bc8f82d16e6269e5ef0da53145a3b24a62f /src/libs/utils/settingsaccessor.cpp | |
| parent | e806ea40ccaff89857604d53fc8e78a155ce9ad1 (diff) | |
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>
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 d25a9ed6df..ad9d3517fb 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); } /*! |