summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/lib7z_facade.h
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2013-04-18 17:54:09 +0200
committerTim Jenssen <tim.jenssen@digia.com>2013-04-19 12:45:48 +0200
commitbbd2cab7c4097a0776c28a5e1d4cc2f8b66b53c1 (patch)
tree57d4ea39a75e42aeb6bd9c0079ce45b565243420 /src/libs/installer/lib7z_facade.h
parentf62a9c18206c0d256120b68b9eb3022e0ca79d23 (diff)
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>
Diffstat (limited to 'src/libs/installer/lib7z_facade.h')
-rw-r--r--src/libs/installer/lib7z_facade.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/installer/lib7z_facade.h b/src/libs/installer/lib7z_facade.h
index e61cce6ac..515d63bba 100644
--- a/src/libs/installer/lib7z_facade.h
+++ b/src/libs/installer/lib7z_facade.h
@@ -11,6 +11,7 @@
#include <QtCore/QString>
#include <QtCore/QVector>
#include <QtCore/QVariant>
+#include <QtCore/QReadWriteLock>
#include "Common/MyWindows.h"
@@ -23,7 +24,6 @@ template <typename T> class QVector;
QT_END_NAMESPACE
namespace Lib7z {
-
class INSTALLER_EXPORT SevenZipException : public std::runtime_error {
public:
explicit SevenZipException( const QString& msg ) : std::runtime_error( msg.toStdString() ), m_message( msg ) {}