From e6b89ee2dd96b6085e66ef4874e43adaa79ade87 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Fri, 13 Apr 2012 14:18:48 +0200 Subject: remove 7z:// protocol leftovers Change-Id: I65abb22a330d928d32800acd357fdd6b27c9399b Reviewed-by: Karsten Heimrich --- src/libs/installer/component.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/libs/installer/component.cpp') 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"); -- cgit v1.2.3