diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-27 16:44:41 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-27 16:44:41 +0100 |
| commit | 1f8ec5b6a4bed3cfa02eaa36d39bceb7d37fc891 (patch) | |
| tree | f225e5fe3d34ba9468634628338a16b1d087071f /src/libs/installer/downloadarchivesjob.cpp | |
| parent | b170fae8b21e25b9ddfc66f985e7d7040ab3d2c0 (diff) | |
| parent | ddf7aa85ec7bada4a96b2692e4b9f1bdd709cbad (diff) | |
Merge remote-tracking branch 'origin/1.5'
Conflicts:
installerfw.pri
Change-Id: I8bd85997fef0fcfa21a4dd28a6362748a54a4a3b
Diffstat (limited to 'src/libs/installer/downloadarchivesjob.cpp')
| -rw-r--r-- | src/libs/installer/downloadarchivesjob.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libs/installer/downloadarchivesjob.cpp b/src/libs/installer/downloadarchivesjob.cpp index 82f9b365c..620eedd60 100644 --- a/src/libs/installer/downloadarchivesjob.cpp +++ b/src/libs/installer/downloadarchivesjob.cpp @@ -319,10 +319,9 @@ KDUpdater::FileDownloader *DownloadArchivesJob::setupDownloader(const QString &s Qt::QueuedConnection); connect(downloader, SIGNAL(downloadStatus(QString)), this, SIGNAL(downloadStatusChanged(QString))); - if (scheme == QLatin1String("http") || scheme == QLatin1String("ftp") || - scheme == QLatin1String("file")) { - downloader->setDownloadedFileName(component->localTempPath() + QLatin1String("/") - + component->name() + QLatin1String("/") + fi.fileName() + suffix); + if (FileDownloaderFactory::isSupportedScheme(scheme)) { + downloader->setDownloadedFileName(component->localTempPath() + QLatin1Char('/') + + component->name() + QLatin1Char('/') + fi.fileName() + suffix); } QString message = tr("Downloading archive hash for component: %1"); |