diff options
| author | Maurice Kalinowski <maurice.kalinowski@nokia.com> | 2011-09-26 10:31:40 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-10-07 22:07:07 +0200 |
| commit | 6175e93c643662b7fc3eac19f65bc5bb158ad63f (patch) | |
| tree | f599cc6ff85dd80efa263b238b74bf475773d4e8 /installerbuilder | |
| parent | 2c7dc2a0a60c7072916bc50b1eca3bd6150f9cee (diff) | |
store additional config files
Qt Creator has multiple files where it stores its configuration.
Currently the removal function only takes away the QtCreator.ini
file, but keeps the Qt versions. This has the side-effect that
some Qt versions appear multiple times.
Change-Id: Id2aa7e5157075a55aca5b70f93695db1d1e3aba7
Reviewed-on: http://codereview.qt-project.org/5524
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'installerbuilder')
| -rw-r--r-- | installerbuilder/libinstaller/packagemanagercore_p.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp index 6af2ffeb1..2e5471241 100644 --- a/installerbuilder/libinstaller/packagemanagercore_p.cpp +++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp @@ -499,8 +499,18 @@ void PackageManagerCorePrivate::initialize() QSettingsWrapper creatorSettings(QSettingsWrapper::IniFormat, QSettingsWrapper::UserScope, QLatin1String("Nokia"), QLatin1String("QtCreator")); QFileInfo info(creatorSettings.fileName()); - if (info.exists()) + if (info.exists()) { m_vars.insert(QLatin1String("QtCreatorSettingsFile"), info.absoluteFilePath()); + QDir settingsDirectory = info.absoluteDir(); + if (settingsDirectory.exists(QLatin1String("qtversion.xml"))) { + m_vars.insert(QLatin1String("QtCreatorSettingsQtVersionFile"), + settingsDirectory.absoluteFilePath(QLatin1String("qtversion.xml"))); + } + if (settingsDirectory.exists(QLatin1String("toolChains.xml"))) { + m_vars.insert(QLatin1String("QtCreatorSettingsToolchainsFile"), + settingsDirectory.absoluteFilePath(QLatin1String("toolChains.xml"))); + } + } if (!m_core->isInstaller()) { #ifdef Q_WS_MAC |