diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-23 13:26:42 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-23 13:26:42 +0200 |
| commit | 1ee847c0dd56fcfbe2d93d64120789083c7a5bcf (patch) | |
| tree | 36c1f524f28e92a56266f452f115ecdd3173fbc0 /src/libs/installer/repository.cpp | |
| parent | d7f58f9f589c7de1a34e73ab4fda48a06a6b4ee4 (diff) | |
| parent | bbd2cab7c4097a0776c28a5e1d4cc2f8b66b53c1 (diff) | |
Merge remote-tracking branch 'origin/1.3'
Conflicts:
src/libs/installer/lib7z_facade.h
Change-Id: I045ca5e4a2a76e5e651bbedc613f086bd60d563d
Diffstat (limited to 'src/libs/installer/repository.cpp')
| -rw-r--r-- | src/libs/installer/repository.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/installer/repository.cpp b/src/libs/installer/repository.cpp index f5b366d05..2f0510760 100644 --- a/src/libs/installer/repository.cpp +++ b/src/libs/installer/repository.cpp @@ -88,12 +88,12 @@ Repository::Repository(const QUrl &url, bool isDefault) */ Repository Repository::fromUserInput(const QString &repositoryUrl) { - QStringList supportedShemes; - supportedShemes << QLatin1String("http") << QLatin1String("https") << QLatin1String("ftp") << + QStringList supportedSchemes; + supportedSchemes << QLatin1String("http") << QLatin1String("https") << QLatin1String("ftp") << QLatin1String("file"); QUrl url = QUrl::fromUserInput(repositoryUrl); - if (!supportedShemes.contains(url.scheme()) && QFileInfo(url.toString()).exists()) + if (!supportedSchemes.contains(url.scheme()) && QFileInfo(url.toString()).exists()) url = QLatin1String("file:///") + url.toString(); QString userName = url.userName(); |