diff options
| author | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2015-07-15 14:47:17 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2015-10-14 05:04:08 +0000 |
| commit | d19d8323c67da31247ca90a75ba390856d29e225 (patch) | |
| tree | ef90dadbaf1492da78ca2e5c0677ac11ffac206c /src/libs/installer | |
| parent | 6c04ab6712516dd76addf35cd924ee73603dbbf3 (diff) | |
Read UrlQueryString from settings.
Task-number: QTIFW-744
Change-Id: Ie67bbb5f753a86041c60f2e32fe6b36213e4613e
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Diffstat (limited to 'src/libs/installer')
| -rw-r--r-- | src/libs/installer/constants.h | 1 | ||||
| -rw-r--r-- | src/libs/installer/downloadarchivesjob.cpp | 2 | ||||
| -rw-r--r-- | src/libs/installer/metadatajob.cpp | 4 | ||||
| -rw-r--r-- | src/libs/installer/settings.cpp | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h index ea6d1334c..0550b94f8 100644 --- a/src/libs/installer/constants.h +++ b/src/libs/installer/constants.h @@ -88,6 +88,7 @@ static const QLatin1String scStyleSheet("StyleSheet"); static const QLatin1String scTitleColor("TitleColor"); static const QLatin1String scWizardDefaultWidth("WizardDefaultWidth"); static const QLatin1String scWizardDefaultHeight("WizardDefaultHeight"); +static const QLatin1String scUrlQueryString("UrlQueryString"); static const QLatin1String scProductUUID("ProductUUID"); static const QLatin1String scAllUsers("AllUsers"); diff --git a/src/libs/installer/downloadarchivesjob.cpp b/src/libs/installer/downloadarchivesjob.cpp index 00ee9dd52..e7b661971 100644 --- a/src/libs/installer/downloadarchivesjob.cpp +++ b/src/libs/installer/downloadarchivesjob.cpp @@ -165,7 +165,7 @@ void DownloadArchivesJob::fetchNextArchive() if (m_downloader != 0) m_downloader->deleteLater(); - m_downloader = setupDownloader(QString(), m_core->value(QLatin1String("UrlQueryString"))); + m_downloader = setupDownloader(QString(), m_core->value(scUrlQueryString)); if (!m_downloader) { m_archivesToDownload.removeFirst(); QMetaObject::invokeMethod(this, "fetchNextArchiveHash", Qt::QueuedConnection); diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp index 26ec0b02e..49f42d717 100644 --- a/src/libs/installer/metadatajob.cpp +++ b/src/libs/installer/metadatajob.cpp @@ -88,8 +88,8 @@ void MetadataJob::doStart() authenticator.setPassword(repo.password()); QString url = repo.url().toString() + QLatin1String("/Updates.xml?"); - if (!m_core->value(QLatin1String("UrlQueryString")).isEmpty()) - url += m_core->value(QLatin1String("UrlQueryString")) + QLatin1Char('&'); + if (!m_core->value(scUrlQueryString).isEmpty()) + url += m_core->value(scUrlQueryString) + QLatin1Char('&'); // also append a random string to avoid proxy caches FileTaskItem item(url.append(QString::number(qrand() * qrand()))); diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index 9d9eb9574..d036fa30f 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -258,7 +258,7 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, << scAllowSpaceInPath << scAllowNonAsciiCharacters << scWizardStyle << scStyleSheet << scTitleColor << scWizardDefaultWidth << scWizardDefaultHeight << scRepositorySettingsPageVisible << scTargetConfigurationFile - << scRemoteRepositories << scTranslations << QLatin1String(scControlScript) + << scRemoteRepositories << scTranslations << scUrlQueryString << QLatin1String(scControlScript) << scCreateLocalRepository << scInstallActionColumnVisible; Settings s; |