diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-21 10:03:13 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-21 10:14:50 +0100 |
| commit | 711c579ffa053acfe49879960bfb1b1b1b5f4c8b (patch) | |
| tree | db9036908d52db1dedf74fe5dd07a9132d7c547d /src/libs/installer/settings.cpp | |
| parent | 515b96469d39c8dfd5ba823ecac371414c02e552 (diff) | |
| parent | 7b584f55c2fee55aabd852aa836d6d8295ee1b22 (diff) | |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
Change-Id: Ia5dd8dfbaa2289f1b167191d6997a5f4340721a2
Diffstat (limited to 'src/libs/installer/settings.cpp')
| -rw-r--r-- | src/libs/installer/settings.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index a225d4262..b591eed90 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -61,6 +61,7 @@ static const QLatin1String scMaintenanceToolIniFile("MaintenanceToolIniFile"); static const QLatin1String scRemoteRepositories("RemoteRepositories"); static const QLatin1String scDependsOnLocalInstallerBinary("DependsOnLocalInstallerBinary"); static const QLatin1String scTranslations("Translations"); +static const QLatin1String scCreateLocalRepository("CreateLocalRepository"); static const QLatin1String scFtpProxy("FtpProxy"); static const QLatin1String scHttpProxy("HttpProxy"); @@ -255,7 +256,8 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, << scAllowSpaceInPath << scAllowNonAsciiCharacters << scWizardStyle << scTitleColor << scWizardDefaultWidth << scWizardDefaultHeight << scRepositorySettingsPageVisible << scTargetConfigurationFile - << scRemoteRepositories << scTranslations << QLatin1String(scControlScript); + << scRemoteRepositories << scTranslations << QLatin1String(scControlScript) + << scCreateLocalRepository; Settings s; s.d->m_data.insert(scPrefix, prefix); @@ -314,6 +316,8 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, s.d->m_data.insert(scDependsOnLocalInstallerBinary, false); if (!s.d->m_data.contains(scRepositorySettingsPageVisible)) s.d->m_data.insert(scRepositorySettingsPageVisible, true); + if (!s.d->m_data.contains(scCreateLocalRepository)) + s.d->m_data.insert(scCreateLocalRepository, false); return s; } @@ -333,7 +337,7 @@ QString Settings::applicationName() const return d->m_data.value(scName).toString(); } -QString Settings::applicationVersion() const +QString Settings::version() const { return d->m_data.value(scVersion).toString(); } @@ -463,6 +467,11 @@ QString Settings::configurationFileName() const return d->m_data.value(scTargetConfigurationFile).toString(); } +bool Settings::createLocalRepository() const +{ + return d->m_data.value(scCreateLocalRepository).toBool(); +} + bool Settings::allowSpaceInPath() const { return d->m_data.value(scAllowSpaceInPath, false).toBool(); |