diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-06-23 15:36:56 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-06-24 17:32:13 +0200 |
| commit | cead45552aad940d60974f8cebf71e8b4e321ca0 (patch) | |
| tree | 93447cee025de5bb416d7986a7e4e10f0da562e9 /src/libs/installer/packagemanagercoredata.cpp | |
| parent | 4272fc8a65e6d5ad6bfe1ea45039a2ac300defb6 (diff) | |
Fix possible case of uninstalling whole windows.
Task-number: QTIFW-511
In case we couldn't read the .dat file or the config file,
target dir will return the path the application was started.
Now we bail out early if one of the files is missing. Fixes
also some outdated code mess when we switched from a single
binary maintenance tool to the split binary version.
Change-Id: I4c70ac4ca63142873ed1521df47d74331669b576
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src/libs/installer/packagemanagercoredata.cpp')
| -rw-r--r-- | src/libs/installer/packagemanagercoredata.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp index a0eafdf79..7bb2ea6cb 100644 --- a/src/libs/installer/packagemanagercoredata.cpp +++ b/src/libs/installer/packagemanagercoredata.cpp @@ -112,14 +112,8 @@ PackageManagerCoreData::PackageManagerCoreData(const QHash<QString, QString> &va m_variables.insert(QLatin1String("AllUsersStartMenuProgramsPath"), replaceWindowsEnvironmentVariables(allPrograms)); #endif - try { - m_settings = Settings::fromFileAndPrefix(QLatin1String(":/metadata/installer-config/config.xml"), - QLatin1String(":/metadata/installer-config/"), Settings::RelaxedParseMode); - } catch (const Error &e) { - // TODO: try better error handling - qCritical("Could not parse Config: %s", qPrintable(e.message())); - return; - } + m_settings = Settings::fromFileAndPrefix(QLatin1String(":/metadata/installer-config/config.xml"), + QLatin1String(":/metadata/installer-config/"), Settings::RelaxedParseMode); // fill the variables defined in the settings m_variables.insert(QLatin1String("ProductName"), m_settings.applicationName()); |