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/lib7z_facade.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/lib7z_facade.h')
| -rw-r--r-- | src/libs/installer/lib7z_facade.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libs/installer/lib7z_facade.h b/src/libs/installer/lib7z_facade.h index 88185375e..35f4ff126 100644 --- a/src/libs/installer/lib7z_facade.h +++ b/src/libs/installer/lib7z_facade.h @@ -23,7 +23,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 ) {} |