diff options
author | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2015-06-10 12:14:16 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2015-06-10 12:53:28 +0000 |
commit | 97b5fe3ebc452d74d70cc7e5a325599ba607cea1 (patch) | |
tree | c6207e934e4fc6726df36ca83568b4abc3a1617d /src/libs | |
parent | a893c90bfa27a6088597eb34355ee4a353712ea5 (diff) |
Update archivegen.
Stop on file errors. Better verbose/ help output. Add support
for compression level. Do not hide symbols in statically build
lib7z to use e.g. CPercentPrinter symbol in dynamic IFW builds.
Task-number: QTIFW-695
Change-Id: I18e2ea58b5f1880bfb7f3ed84e34b8810f864188
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/7zip/7zip.pri | 9 | ||||
-rw-r--r-- | src/libs/installer/lib7z_facade.h | 18 |
2 files changed, 23 insertions, 4 deletions
diff --git a/src/libs/7zip/7zip.pri b/src/libs/7zip/7zip.pri index 85574ce5e..26c052fc7 100644 --- a/src/libs/7zip/7zip.pri +++ b/src/libs/7zip/7zip.pri @@ -4,7 +4,6 @@ win32 { 7ZIP_BASE=$$PWD/win INCLUDEPATH += $$7ZIP_BASE/C $$7ZIP_BASE/CPP DEFINES += WIN_LONG_PATH _CRT_SECURE_NO_WARNINGS - win32-g++*:QMAKE_CXXFLAGS += -w -fvisibility=hidden QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO -= -Zc:strictStrings @@ -18,9 +17,11 @@ unix { $$7ZIP_BASE/CPP/myWindows \ $$7ZIP_BASE/CPP/include_windows - QMAKE_CFLAGS += -w - QMAKE_CXXFLAGS += -fvisibility=hidden -w - macx:DEFINES += ENV_MACOSX DEFINES += _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE NDEBUG _REENTRANT ENV_UNIX UNICODE } + +unix|win32-g++* { + QMAKE_CFLAGS += -w + QMAKE_CXXFLAGS += -w +} diff --git a/src/libs/installer/lib7z_facade.h b/src/libs/installer/lib7z_facade.h index b252e7696..527cf65ab 100644 --- a/src/libs/installer/lib7z_facade.h +++ b/src/libs/installer/lib7z_facade.h @@ -37,6 +37,9 @@ #include "installer_global.h" #include "errors.h" +#include <Common/MyWindows.h> +#include <7zip/UI/Console/PercentPrinter.h> + QT_BEGIN_NAMESPACE class QFileDevice; QT_END_NAMESPACE @@ -59,6 +62,21 @@ namespace Lib7z {} }; + class INSTALLER_EXPORT PercentPrinter : public CPercentPrinter + { + public: + PercentPrinter() : CPercentPrinter(1 << 16) { + OutStream = &g_StdOut; + } + + void PrintRatio() { CPercentPrinter::PrintRatio(); } + void ClosePrint() { CPercentPrinter::ClosePrint(); } + void RePrintRatio() { CPercentPrinter::RePrintRatio(); } + void PrintNewLine() { CPercentPrinter::PrintNewLine(); } + void PrintString(const char *s) { CPercentPrinter::PrintString(s); } + void PrintString(const wchar_t *s) { CPercentPrinter::PrintString(s); } + }; + } // namespace Lib7z #endif // LIB7Z_FACADE_H |