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/extractarchiveoperation_p.h | |
| 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/extractarchiveoperation_p.h')
| -rw-r--r-- | src/libs/installer/extractarchiveoperation_p.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libs/installer/extractarchiveoperation_p.h b/src/libs/installer/extractarchiveoperation_p.h index 846bda83a..44e75a949 100644 --- a/src/libs/installer/extractarchiveoperation_p.h +++ b/src/libs/installer/extractarchiveoperation_p.h @@ -190,12 +190,7 @@ public: Lib7z::extractArchive(&archive, targetDir, callback); emit finished(true, QString()); } catch (const Lib7z::SevenZipException& e) { -#ifdef Q_OS_WIN - emit finished(false, tr("Error while extracting %1: %2. (Maybe the target dir(%3) is blocked by " - "another process.)").arg(archivePath, e.message(), targetDir)); -#else - emit finished(false, tr("Error while extracting %1: %2.").arg(archivePath, e.message())); -#endif + emit finished(false, tr("Error while extracting '%1': %2").arg(archivePath, e.message())); } catch (...) { emit finished(false, tr("Unknown exception caught while extracting %1.").arg(archivePath)); } |