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/sdk/installerbase.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/sdk/installerbase.cpp')
| -rw-r--r-- | src/sdk/installerbase.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index 7eb816a1a..9387b3b81 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -197,7 +197,8 @@ int InstallerBase::run() QInstaller::PackageManagerCore::setNoForceInstallation(parser .isSet(QLatin1String(CommandLineOptions::NoForceInstallation))); QInstaller::PackageManagerCore::setCreateLocalRepositoryFromBinary(parser - .isSet(QLatin1String(CommandLineOptions::CreateOfflineRepository))); + .isSet(QLatin1String(CommandLineOptions::CreateLocalRepository)) + || m_core->settings().createLocalRepository()); QHash<QString, QString> params; const QStringList positionalArguments = parser.positionalArguments(); @@ -228,7 +229,7 @@ int InstallerBase::run() translator.reset(new QTranslator(QCoreApplication::instance())); // install English translation as fallback so that correct license button text is used - if (translator->load(QLatin1String("en_us"), directory)) + if (translator->load(QLatin1String("en"), directory)) QCoreApplication::instance()->installTranslator(translator.take()); if (translations.isEmpty()) { |