diff options
author | Christoph VogtlÃĪnder <c.vogtlaender@sigma-surface-science.com> | 2015-01-08 14:14:17 +0100 |
---|---|---|
committer | Niels Weber <niels.weber@theqtcompany.com> | 2015-01-08 15:18:59 +0100 |
commit | 86a40b0fca8f075c51870d80a8789bec06076a8f (patch) | |
tree | 9b62cf0c5c6602ec92a3fe1d04950dfbd20426ec | |
parent | f87efd7c14e0a332341e58ed1e52d46328e31d03 (diff) |
rename CreateOfflineRepository to CreateLocalRepository
Change-Id: I36d7a504b27dfff8b9d10c9d90b6ff77108b9982
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
-rw-r--r-- | doc/installerfw.qdoc | 2 | ||||
-rw-r--r-- | src/libs/installer/settings.cpp | 12 | ||||
-rw-r--r-- | src/libs/installer/settings.h | 2 | ||||
-rw-r--r-- | src/sdk/commandlineparser.cpp | 2 | ||||
-rw-r--r-- | src/sdk/constants.h | 2 | ||||
-rw-r--r-- | src/sdk/installerbase.cpp | 4 | ||||
-rw-r--r-- | tests/auto/installer/settings/data/full_config.xml | 2 | ||||
-rw-r--r-- | tests/auto/installer/settings/tst_settings.cpp | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index cd00f4d7c..895f1f2d6 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -298,7 +298,7 @@ \li ControlScript \li Filename for a custom installer control script. See \l{Controller Scripting}. \row - \li CreateOfflineRepository + \li CreateLocalRepository \li Set to \c true if you want to create a local repository inside the installation directory. This option has no effect on online installers. The repository will be automatically added to the list of default repositories. diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index c8d15726f..3d5fcf284 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -61,7 +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 scCreateOfflineRepository("CreateOfflineRepository"); +static const QLatin1String scCreateLocalRepository("CreateLocalRepository"); static const QLatin1String scFtpProxy("FtpProxy"); static const QLatin1String scHttpProxy("HttpProxy"); @@ -257,7 +257,7 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, << scWizardDefaultWidth << scWizardDefaultHeight << scRepositorySettingsPageVisible << scTargetConfigurationFile << scRemoteRepositories << scTranslations << QLatin1String(scControlScript) - << scCreateOfflineRepository; + << scCreateLocalRepository; Settings s; s.d->m_data.insert(scPrefix, prefix); @@ -316,8 +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(scCreateOfflineRepository)) - s.d->m_data.insert(scCreateOfflineRepository, false); + if (!s.d->m_data.contains(scCreateLocalRepository)) + s.d->m_data.insert(scCreateLocalRepository, false); return s; } @@ -467,9 +467,9 @@ QString Settings::configurationFileName() const return d->m_data.value(scTargetConfigurationFile).toString(); } -bool Settings::createOfflineRepository() const +bool Settings::createLocalRepository() const { - return d->m_data.value(scCreateOfflineRepository).toBool(); + return d->m_data.value(scCreateLocalRepository).toBool(); } bool Settings::allowSpaceInPath() const diff --git a/src/libs/installer/settings.h b/src/libs/installer/settings.h index 3bddc4726..68f97b82a 100644 --- a/src/libs/installer/settings.h +++ b/src/libs/installer/settings.h @@ -111,7 +111,7 @@ public: QString configurationFileName() const; - bool createOfflineRepository() const; + bool createLocalRepository() const; bool dependsOnLocalInstallerBinary() const; bool hasReplacementRepos() const; diff --git a/src/sdk/commandlineparser.cpp b/src/sdk/commandlineparser.cpp index 9c4200b3e..bb7ccd679 100644 --- a/src/sdk/commandlineparser.cpp +++ b/src/sdk/commandlineparser.cpp @@ -76,7 +76,7 @@ CommandLineParser::CommandLineParser() m_parser.addOption(QCommandLineOption(QLatin1String(CommandLineOptions::ShowVirtualComponents), QLatin1String("Show virtual components in installer and package manager."))); - m_parser.addOption(QCommandLineOption(QLatin1String(CommandLineOptions::CreateOfflineRepository), + m_parser.addOption(QCommandLineOption(QLatin1String(CommandLineOptions::CreateLocalRepository), QLatin1String("Create a local repository inside the installation directory. This option " "has no effect on online installers."))); diff --git a/src/sdk/constants.h b/src/sdk/constants.h index 44fe1f598..924d4783a 100644 --- a/src/sdk/constants.h +++ b/src/sdk/constants.h @@ -50,7 +50,7 @@ const char Updater[] = "updater"; const char ManagePackages[] = "manage-packages"; const char NoForceInstallation[] = "no-force-installations"; const char ShowVirtualComponents[] = "show-virtual-components"; -const char CreateOfflineRepository[] = "create-offline-repository"; +const char CreateLocalRepository[] = "create-local-repository"; const char AddRepository[] = "addRepository"; const char AddTmpRepository[] = "addTempRepository"; const char SetTmpRepository[] = "setTempRepository"; diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index 2d9572e49..9387b3b81 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -197,8 +197,8 @@ int InstallerBase::run() QInstaller::PackageManagerCore::setNoForceInstallation(parser .isSet(QLatin1String(CommandLineOptions::NoForceInstallation))); QInstaller::PackageManagerCore::setCreateLocalRepositoryFromBinary(parser - .isSet(QLatin1String(CommandLineOptions::CreateOfflineRepository)) - || m_core->settings().createOfflineRepository()); + .isSet(QLatin1String(CommandLineOptions::CreateLocalRepository)) + || m_core->settings().createLocalRepository()); QHash<QString, QString> params; const QStringList positionalArguments = parser.positionalArguments(); diff --git a/tests/auto/installer/settings/data/full_config.xml b/tests/auto/installer/settings/data/full_config.xml index 964b52968..5479fa353 100644 --- a/tests/auto/installer/settings/data/full_config.xml +++ b/tests/auto/installer/settings/data/full_config.xml @@ -38,7 +38,7 @@ File should contain all elements we allow in a config.xml <AllowSpaceInPath>true</AllowSpaceInPath> <AllowNonAsciiCharacters>true</AllowNonAsciiCharacters> <RepositorySettingsPageVisible>false</RepositorySettingsPageVisible> - <CreateOfflineRepository>false</CreateOfflineRepository> + <CreateLocalRepository>false</CreateLocalRepository> <TargetConfigurationFile>components.xml</TargetConfigurationFile> <RemoteRepositories> diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index 96a44ecca..241e4e546 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -72,7 +72,7 @@ void tst_Settings::loadTutorialConfig() QCOMPARE(settings.repositorySettingsPageVisible(), true); QCOMPARE(settings.allowSpaceInPath(), false); QCOMPARE(settings.allowNonAsciiCharacters(), false); - QCOMPARE(settings.createOfflineRepository(), false); + QCOMPARE(settings.createLocalRepository(), false); QCOMPARE(settings.hasReplacementRepos(), false); QCOMPARE(settings.repositories(), QSet<Repository>()); |