diff options
| author | Tim Jenssen <tim.jenssen@nokia.com> | 2012-04-13 14:18:48 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-04-13 14:56:55 +0200 |
| commit | e6b89ee2dd96b6085e66ef4874e43adaa79ade87 (patch) | |
| tree | 281d8f440d426ecde0323d38f51721649d93b086 | |
| parent | 6f929b707aa25a18f412c722c5117dfe737c9e93 (diff) | |
remove 7z:// protocol leftovers
Change-Id: I65abb22a330d928d32800acd357fdd6b27c9399b
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
| -rw-r--r-- | src/libs/installer/component.cpp | 16 | ||||
| -rw-r--r-- | src/libs/installer/fsengineclient.cpp | 2 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 8f1a2337e..41ad2eeb0 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -559,20 +559,8 @@ void Component::createOperationsForPath(const QString &path) return; QString target; - static const QString zipPrefix = QString::fromLatin1("7z://installer://"); - // if the path is an archive, remove the archive file name from the target path - if (path.startsWith(zipPrefix)) { - target = path.mid(zipPrefix.length() + name().length() + 1); // + 1 for the / - const int nextSlash = target.indexOf(QLatin1Char('/')); - if (nextSlash != -1) - target = target.mid(nextSlash); - else - target.clear(); - target.prepend(QLatin1String("@TargetDir@")); - } else { - static const QString prefix = QString::fromLatin1("installer://"); - target = QString::fromLatin1("@TargetDir@%1").arg(path.mid(prefix.length() + name().length())); - } + static const QString prefix = QString::fromLatin1("installer://"); + target = QString::fromLatin1("@TargetDir@%1").arg(path.mid(prefix.length() + name().length())); if (fi.isFile()) { static const QString copy = QString::fromLatin1("Copy"); diff --git a/src/libs/installer/fsengineclient.cpp b/src/libs/installer/fsengineclient.cpp index 1858d7408..beed6d32d 100644 --- a/src/libs/installer/fsengineclient.cpp +++ b/src/libs/installer/fsengineclient.cpp @@ -716,7 +716,7 @@ QAbstractFileEngine* FSEngineClientHandler::create(const QString &fileName) cons d->maybeStartServer(); static QRegExp re(QLatin1String("^[a-z0-9]*://.*$")); - if (re.exactMatch(fileName)) // stuff like installer:// 7z:// and so on + if (re.exactMatch(fileName)) // stuff like installer:// return 0; if (fileName.isEmpty() || fileName.startsWith(QLatin1String(":"))) |