diff options
author | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2015-06-09 16:04:24 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2015-06-10 08:15:38 +0000 |
commit | 4677d362982a38c6e2aabb667e33aaa7f921f018 (patch) | |
tree | fe3b676288f05a87cdbb53a170e815427e3d9380 /src/libs/7zip/7zip.pro | |
parent | 22ec6aa53e44069c03c7baf94881949c7a4facff (diff) |
Update source tree with version 9.38.beta of LZMA SDK.
- Remove unused files.
- Split in .pri files.
- Add HEADERS section.
- Adjust lib7z_facade.
Change-Id: I31e7bafbfe1a9346364bd58c391601955f98ad3a
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/libs/7zip/7zip.pro')
-rw-r--r-- | src/libs/7zip/7zip.pro | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/libs/7zip/7zip.pro b/src/libs/7zip/7zip.pro index 01b69dad2..70a51c068 100644 --- a/src/libs/7zip/7zip.pro +++ b/src/libs/7zip/7zip.pro @@ -7,15 +7,5 @@ CONFIG += staticlib DESTDIR = $$IFW_LIB_PATH include(7zip.pri) -win32 { - DEFINES += _CRT_SECURE_NO_WARNINGS - win32-g++*:QMAKE_CXXFLAGS += -w -fvisibility=hidden - CONFIG += no_batch # this is needed because we have a same named *.c and *.cpp file -> 7in - include($$7ZIP_BASE/win.pri) #this is 7zip -} - -unix { - QMAKE_CFLAGS += -w - QMAKE_CXXFLAGS += -fvisibility=hidden -w - include($$7ZIP_BASE/unix.pri) #this is p7zip -} +win32:include($$7ZIP_BASE/win.pri) #7zip +unix:include($$7ZIP_BASE/unix.pri) #p7zip |