summaryrefslogtreecommitdiffstats
path: root/src/libs/7zip
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/2.0'Katja Marttila2017-01-301-17/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Changelog dist/config/config.xml dist/packages/org.qtproject.ifw.binaries/meta/package.xml dist/packages/org.qtproject.ifw/meta/package.xml installerfw.pri src/libs/installer/lib7z_create.h src/libs/kdtools/kdgenericfactory.cpp src/libs/kdtools/kdgenericfactory.h src/libs/kdtools/kdupdaterapplication.cpp src/libs/kdtools/kdupdaterapplication.h src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp src/libs/kdtools/kdupdaterupdatesourcesinfo.h src/libs/kdtools/localpackagehub.cpp src/libs/kdtools/localpackagehub.h src/libs/kdtools/updatefinder.cpp src/libs/kdtools/updatefinder.h tools/binarycreator/resources/mkdmg.sh Change-Id: Iab2513f549832d2e750e77131c673457ab265af4
| * License header update to GPL-EXCEPTKatja Marttila2017-01-261-17/+12
| | | | | | | | | | Change-Id: I6426c4e8f932cf26c6c638dec18d0c12e22972d1 Reviewed-by: Janne Anttila <janne.anttila@theqtcompany.com>
* | Merge remote-tracking branch 'origin/2.0'Katja Marttila2016-06-211-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Changelog dist/config/config.xml dist/packages/org.qtproject.ifw.binaries/meta/package.xml dist/packages/org.qtproject.ifw/meta/package.xml installerfw.pri src/libs/7zip/7zip.pro src/libs/7zip/win/CPP/7zip/UI/Common/Update.cpp src/libs/installer/component.cpp src/libs/installer/lib7z_facade.cpp src/libs/installer/packagemanagercore.cpp src/libs/installer/proxycredentialsdialog.h src/sdk/translations/ja.ts tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp tests/auto/installer/scriptengine/tst_scriptengine.cpp tests/auto/installer/settings/tst_settings.cpp Change-Id: I3bb98b8490b3c3eb7f664c1abb7417155b5430b2
| * add make install functionality with INSTALL_ROOTKatja Marttila2016-05-191-0/+3
| | | | | | | | | | | | Change-Id: I8bad1c9bbe7b705ff0842f15fb0c9bc6c127e9bc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
| * Fix MSVC2015 build.Rafael Roquetto2016-04-182-2/+2
| | | | | | | | | | Change-Id: I502e48dea6329bd6f05a776a669093f41698a274 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Merge remote-tracking branch 'origin/2.0'Iikka Eklund2016-01-201-4/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: installerfw.pri src/libs/kdtools/kdgenericfactory.cpp src/libs/kdtools/kdgenericfactory.h src/libs/kdtools/kdupdaterapplication.cpp src/libs/kdtools/kdupdaterapplication.h src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp src/libs/kdtools/kdupdaterupdatesourcesinfo.h sync.profile Change-Id: Ifdc8b065f89b7e241bd3788ed79768e21888161f
| * Update license headersIikka Eklund2015-12-291-4/+3
| | | | | | | | | | | | | | | | | | Update existing license headers. LGPL -> LGPLv21. Update copyright year as well. Change-Id: Ie1d71f8c68186b8f625f409ddf94691f178093c9 Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Follow description on MSDN to implement time utils.Karsten Heimrich2015-06-232-62/+110
| | | | | | | | | | | | Task-number: QTIFW-445 Change-Id: I8c3bc221f57043cc876f1927edf0d591303b5687 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Update archivegen.Karsten Heimrich2015-06-101-4/+5
| | | | | | | | | | | | | | | | | | | | 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>
* | Update source tree with version 9.38.beta of LZMA SDK.Karsten Heimrich2015-06-10674-38782/+48816
|/ | | | | | | | | | - Remove unused files. - Split in .pri files. - Add HEADERS section. - Adjust lib7z_facade. Change-Id: I31e7bafbfe1a9346364bd58c391601955f98ad3a Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update CopyrightKai Koehne2015-02-181-7/+7
| | | | | Change-Id: I8dde6629cfd461104364d5cdc255cb54b58283fa Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Fix compilation with CONFIG+=force_debug_info (2nd attempt)Kai Koehne2015-01-151-1/+1
| | | | | | | Fix incorrect capitalization of option commit df99f9319e . Change-Id: Ifad4aadba0d8fddb0d629e7a883d4313a6e0f940 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Fix compilation with CONFIG+=force_debug_infoKai Koehne2015-01-131-0/+1
| | | | | Change-Id: I1759bfc043322a40e3c837b19e4e1bbcbdb4a47e Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Add LGPLv3 as new licenseKai Koehne2014-10-161-14/+7
| | | | | | | Change-Id: I61158f956894e209dccf83744b4753774676099d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* Fix build with Qt 5.4 and MSVC2013 (release)Kai Koehne2014-10-091-0/+1
| | | | | | | | | | Qt 5.4 adds '-Zc:strictStrings' to the win32-2013 mkspec (commit 9f0e5d00ab51c). 7zip sources however aren't compatible with this setting. Task-number: QTIFW-542 Change-Id: Ibb92afba1f890ca07c3805ce1dedf55c0eac3c57 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Calm down warnings.kh12014-07-091-1/+0
| | | | | | | | [-Wunused-private-field] and file has no symbols Change-Id: Ie9c9f53041711ee2ba42909fb88e0b9a8a8ebac9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix incremental buildsMichal Klocek2013-09-171-2/+1
| | | | | | | | | The missing dependency to installer library causes corrupted incremental builds, installerbase should be rebuild when installer lib is changed. Change-Id: I588577f3d178c70dff2d84747f221d924e5cf38e Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Implementation of time and date functions related to 7z.Niels Weber2013-05-303-11/+88
| | | | | | Change-Id: Icb706d829f8470d8cc3cc50925c99255cf5f2b26 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Reset to only use the basic LZMA SDK (Windows).kh12013-05-08321-67336/+348
| | | | | | Change-Id: I8088cc4775f6c5397991f00512354836d614ea4e Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Replace the external date and time implementation.Niels Weber2013-05-073-435/+72
| | | | | | | | For now, replace it with a stub, the missing functionality isn't that crucial and will be reimplemented later. Change-Id: I2413069ad7837c8ccadc1c40e89eaf078674ee9e Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Remove local filetime.Niels Weber2013-05-072-7/+2
| | | | | | | | | | | | This leads to time being wrong by a couple of hours depending on usage of local time vs UTC. This has been deemed acceptable for now. Also skip the test failing because of that difference. Needs to be re-enabled when all time functionality has been rewritten. Change-Id: I23d78371df65878d16e0e428c9fca9387e29a908 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Remove DosTime support from 7zip lib.Niels Weber2013-05-073-29/+0
| | | | | | | We don't support that anyway and it complicates the DateAndTime implementation a lot. Change-Id: Ibb4f3bdf00beeb74446865376cdb67bd8337d5fd Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Cleanup installer_framework_changes.txtNiels Weber2013-05-063-1030/+54
| | | | | | Change-Id: I96671be32c66befdaa61a90440e164c6eba6fc07 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix compile error.kh12013-05-061-0/+8
| | | | | | | Inconsistent operand constraints in an 'asm'... Change-Id: If68fec366d5a059c1d253f056348c76df8cd4d05 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix windows build.kh12013-05-021-2/+2
| | | | | Change-Id: I0473499e6c77f27076bc7ea35c2db965de2af04f Reviewed-by: Niels Weber <niels.weber@digia.com>
* Reset to only use the basic LZMA SDK (Unix).kh12013-05-02355-75799/+443
| | | | | Change-Id: Ic7607229197f74cdf88c46684b1413e00466185d Reviewed-by: Niels Weber <niels.weber@digia.com>
* Fix build on OSX. BREAK_HANDLER is only needed for 7z console tool.kh12013-01-311-1/+1
| | | | | | Change-Id: I96f00b8008a8055c7eb12523d8beb329f7322f7f Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Make IFW compile with mingw.kh12013-01-292-2/+3
| | | | | Change-Id: I0336e02ef701a2bc392bd385d1822bc51cee0c5c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix some warnings in our code after Idcfec77.kh12013-01-232-3/+3
| | | | | | Change-Id: Ied8ffad416ae058a45fa2d46f8ff304ff5b4a392 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Remove some superfluous include and source files.kh12013-01-232-87/+111
| | | | | Change-Id: I5f4d83efd6195bb6e139de49c1a17d0c61907dbf Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Build 7z static to suppress warnings inside there.kh12013-01-234-28/+35
| | | | | | Change-Id: Idcfec77f911f97358f8930c8f0d95fa1724daaeb Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix wrong use of CXXFLAGS and fvisibility should contain =hidden.kh12013-01-171-1/+1
| | | | | | Change-Id: Iebfbf96c964343b09de09459ab8b4ca0619000d5 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* reduce warnings on old gcc versions (Mac used 4.2.1)Tim Jenssen2012-10-3114-18/+18
| | | | | | Change-Id: Icf60411ea67900b98fec91570b8799d65751f9ee Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* MinGW: fix constness for CByteDynBuffer::operator Byte*Sergei Lopatin2012-10-261-1/+1
| | | | | Change-Id: I45ee3a3df3755537f063277b9070c1eab55edcc2 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Revert "Fixes required for errorless MinGW-w64 compilation are done."kh12012-08-2238-83/+69
| | | | | | | | This reverts commit 9cad5d54cf0d78e92b4ee831299d83b657f42f2e as it breaks compressing the meta folder (Windows 7, VS 2010). Change-Id: I24d4ec37941487fc3cc998706d33cd5d8b9f011a Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Fixes required for errorless MinGW-w64 compilation are done.tjenssen2012-08-1038-69/+83
| | | | | | Change-Id: Iedc83b536df9f00e3737d7c92c4a57d6c0feb07a Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Reorganize the tree, have better ifw.pri. Shadow build support.kh12012-03-191326-0/+248037
Change-Id: I01fb12537f863ed0744979973c7e4153889cc5cb Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>