diff options
| author | Tim Jenssen <tim.jenssen@nokia.com> | 2012-04-25 14:14:56 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-04-27 16:23:20 +0200 |
| commit | 0a8755ace26f1174e9ed99e5060c4d8da0ba010d (patch) | |
| tree | 7d73b3e0151b06707d8b9df5cef25be7203a420f /src/libs/installer/settings.cpp | |
| parent | ff6179ea53debd66e63738382b3af62087b81af7 (diff) | |
now installer can disallow to install from a remote location
- at the moment the implementation is windows only
- in some cases it is problematically to install big installers from a
remote location: if the connection is lost -> crash
- the installer itself can have the flag DependsOnLocalInstallerBinary in the config.xml file
- or a component can request that installer.setDependsOnLocalInstallerBinary()
Change-Id: I0c8d70ca89dd55d2d0c52bf3418f11c95b5290a1
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Diffstat (limited to 'src/libs/installer/settings.cpp')
| -rw-r--r-- | src/libs/installer/settings.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index ace61761e..c7b1394cc 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -57,6 +57,7 @@ static const QLatin1String scTmpRepositories("TemporaryRepositories"); static const QLatin1String scUninstallerIniFile("UninstallerIniFile"); static const QLatin1String scRemoteRepositories("RemoteRepositories"); static const QLatin1String scSigningCertificate("SigningCertificate"); +static const QLatin1String scDependsOnLocalInstallerBinary("DependsOnLocalInstallerBinary"); static const QLatin1String scFtpProxy("FtpProxy"); static const QLatin1String scHttpProxy("HttpProxy"); @@ -230,6 +231,8 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix) s.d->m_data.insert(scTargetConfigurationFile, QLatin1String("components.xml")); if (!s.d->m_data.contains(scUninstallerIniFile)) s.d->m_data.insert(scUninstallerIniFile, s.uninstallerName() + QLatin1String(".ini")); + if (!s.d->m_data.contains(scDependsOnLocalInstallerBinary)) + s.d->m_data.insert(scDependsOnLocalInstallerBinary, false); return s; } @@ -345,6 +348,11 @@ bool Settings::allowNoneAsciiCharacters() const return d->m_data.value(scAllowNonAsciiCharacters).toBool(); } +bool Settings::dependsOnLocalInstallerBinary() const +{ + return d->m_data.value(scDependsOnLocalInstallerBinary).toBool(); +} + bool Settings::hasReplacementRepos() const { return d->m_replacementRepos; |