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/settings.h | |
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/settings.h')
-rw-r--r-- | src/libs/installer/settings.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libs/installer/settings.h b/src/libs/installer/settings.h index 8ffbfc004..fcea7cb55 100644 --- a/src/libs/installer/settings.h +++ b/src/libs/installer/settings.h @@ -74,13 +74,19 @@ public: UserDefinedProxy }; + enum ParseMode { + StrictParseMode, + RelaxedParseMode + }; + explicit Settings(); ~Settings(); Settings(const Settings &other); Settings &operator=(const Settings &other); - static Settings fromFileAndPrefix(const QString &path, const QString &prefix); + static Settings fromFileAndPrefix(const QString &path, const QString &prefix, + ParseMode parseMode = StrictParseMode); QString logo() const; QString title() const; |