diff options
| author | kh1 <karsten.heimrich@digia.com> | 2013-03-26 13:10:09 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2013-03-26 13:21:01 +0100 |
| commit | e29ef32ec02e01d51065962e0b0f88c70121b3de (patch) | |
| tree | b6e741e56acd46567fa59c4fe0f8c6edd9a7a1d1 /src/libs/installer/updatesettings.cpp | |
| parent | 2774e4fd95a6e8d6777fab1e708bf04aa6055c39 (diff) | |
Add strict and relaxed parsing to Settings class.
* StrictParseMode -> creating binaries and repositories
* RelaxedParseMode -> running the installer/updater itself
Introduced parse modes to be able to use old settings (existing
ones on user systems) with new binaries. Add and adjust autotest.
Change-Id: I3f7c7357325661a1197400d8d8dc2a5ca8bed184
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/libs/installer/updatesettings.cpp')
| -rw-r--r-- | src/libs/installer/updatesettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/installer/updatesettings.cpp b/src/libs/installer/updatesettings.cpp index da6ab9319..2e876839f 100644 --- a/src/libs/installer/updatesettings.cpp +++ b/src/libs/installer/updatesettings.cpp @@ -153,7 +153,7 @@ QSet<Repository> UpdateSettings::repositories() const try { if(result.isEmpty()) { result = Settings::fromFileAndPrefix(QLatin1String(":/metadata/installer-config/config.xml"), - QLatin1String(":/metadata/installer-config/")).userRepositories(); + QLatin1String(":/metadata/installer-config/"), Settings::RelaxedParseMode).userRepositories(); } } catch (const Error &error) { qDebug("Could not parse config: %s", qPrintable(error.message())); |