fix error handling in 7z lib

 - remove an already existing symlink at extraction, because it uses
   QFile to get the io device and that would be the symlink target
   which was wrong.
 - try to get better 7z error output
 - an error would be now: "There was a problem while performing the
   operation: Error while extracting 'C:\Qt\qtcreator-2.7.0_test.7z':
   Cannot open file: D:/test/qtcreator-2.7.0_test/bin/sqldrivers/qsqlite4.dll
   (Access is denied.)"
 - move setPermissions to the end so read only files are getting the right timestamp

Change-Id: I8881144660296618d443568e6974bf2721328991
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

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));
         }