diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2020-05-25 10:10:25 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2020-05-25 12:04:25 +0000 |
| commit | 298fd64d3ddbe6de3607b51c4b71b221de07ce2a (patch) | |
| tree | da231fda8d652d0a3b5b7283b3d657e86eb5851b /src/libs | |
| parent | 4811c094a0f15fffbf3016f69bbba57a0ffe0cbe (diff) | |
| parent | eb500c4b5b810198acb1f32602a20a84a460aeb9 (diff) | |
Merge remote-tracking branch 'origin/3.2' into master
Change-Id: Icd1dbcfa7f6eef138aad5287a6dcdf7d061a7d70
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/installer/metadatajob.cpp | 7 | ||||
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp index 7651ee51c..4e3edaa05 100644 --- a/src/libs/installer/metadatajob.cpp +++ b/src/libs/installer/metadatajob.cpp @@ -59,6 +59,13 @@ MetadataJob::MetadataJob(QObject *parent) , m_downloadableChunkSize(1000) , m_taskNumber(0) { + QByteArray downloadableChunkSize = qgetenv("IFW_METADATA_SIZE"); + if (!downloadableChunkSize.isEmpty()) { + int chunkSize = QString::fromLocal8Bit(downloadableChunkSize).toInt(); + if (chunkSize > 0) + m_downloadableChunkSize = chunkSize; + } + setCapabilities(Cancelable); connect(&m_xmlTask, &QFutureWatcherBase::finished, this, &MetadataJob::xmlTaskFinished); connect(&m_metadataTask, &QFutureWatcherBase::finished, this, &MetadataJob::metadataTaskFinished); diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index c3fd07ac4..d4103368d 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -1886,7 +1886,7 @@ void PackageManagerCorePrivate::installComponent(Component *component, double pr // show only components which do something, MinimumProgress is only for progress calculation safeness bool showDetailsLog = false; if (opCount > 1 || (opCount == 1 && operations.at(0)->name() != QLatin1String("MinimumProgress"))) { - ProgressCoordinator::instance()->emitLabelAndDetailTextChanged(tr("\nInstalling component %1...") + ProgressCoordinator::instance()->emitLabelAndDetailTextChanged(tr("\nInstalling component %1") .arg(component->displayName())); showDetailsLog = true; } |