summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update source tree with version 9.38.beta of LZMA SDK.Karsten Heimrich2015-06-10685-39901/+49649
| | | | | | | | | | - 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 documentation and adjust some code to match.Karsten Heimrich2015-06-092-57/+48
| | | | | Change-Id: I3a8d9afb79628135051e4133bea9fc66e14a514a Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Inherit from existing QInstaller::Error class.Karsten Heimrich2015-06-092-16/+16
| | | | | | | Remove superfluous qDebug to avoid printing the message always. Change-Id: Ia15815fc476e9e48d24d307e8c6875b0506ab7c0 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix compilation error in testsKai Koehne2015-06-092-1/+3
| | | | | | | | | Commit 947e85b47c caused QDomElement to be referenced in the headers included by the testcases. Rather forward declare it to avoid having to add QT += xml to all tests. Change-Id: I85427efb5d76eea7b086382ff2dbe823faeecdad Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Store AutoDependOn inside components.xmlJarek Kobus2015-06-057-45/+96
| | | | | Change-Id: Id304ca857ee1897c35171d6c293774f1d638bc02 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Reuse existing structures inside Update class.Jarek Kobus2015-06-054-36/+16
| | | | | Change-Id: I481b0129c5263da4969053d658e30fb671acf74e Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/2.0'"Karsten Heimrich2015-06-0431-434/+1503
|\
| * Merge remote-tracking branch 'origin/2.0'Kai Koehne2015-06-0431-434/+1503
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/libs/installer/packagemanagercore.cpp Change-Id: Ie3d94fe3a633e189c260bf20682c00a2bb901bc8
| | * Doc: Mention what you can do with a control script early onKai Koehne2015-06-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTIFW-166 Change-Id: I42ff186b7f4203b6f29685d10136e25089892c4d Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
| | * Fix maintenance tool upgrade on OSX.Karsten Heimrich2015-06-031-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Before rename we need to delete a possible existing file, otherwise it will fail and the installation is messed up. Change-Id: I6ade434f828f11b38c00b52eabeb1c574557ec5a Reviewed-by: Jonathan Courtois <jonathan.courtois@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * Doc: add docs for devtool2.0.1Leena Miettinen2015-06-011-0/+49
| | | | | | | | | | | | | | | | | | Change-Id: Iadb453a02b331bb2cf9f8f0a4e1fe66052abe264 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
| | * Update 2.0.1 ChangeLogKai Koehne2015-06-011-1/+5
| | | | | | | | | | | | | | | Change-Id: If4dff4d3557a3e942937ae293924c59497ead8e3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| | * OS X: Make sure real user uid == euid in elevated modeKai Koehne2015-06-011-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug that prevents changing existing .ini files during an elevated installation. QFileSystemEngine::fillMetaData() on Unix uses :access() to check whether the user can write to a file, based on the real user id. Because OS X's AuthorizationExecuteWithPrivileges() does keep the original real user id also in the elevated process, QFileInfo::isWritable() was returning false for existing files, which in turn let QSaveFile, and therefore QSettings, to not even attempt to write to the file. On Linux, we use sudo to start the elevated process, which already resets the real user id by default. Task-number: QTIFW-709 Change-Id: I5bfbd631f579412045b242a08baf206a5d444500 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
| | * Doc: Clarify use of addOperationKai Koehne2015-05-292-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | Make it explicit that addOperation , addElevatedOperation should be usually called from within createOperations(). Change-Id: Id14339b1259716825a9443cc563449025674976f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| | * Doc: Add a link to QInstaller::BinaryContent docs.Leena Miettinen2015-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | And remove the ##TODO Task-number: QTIFW-693 Change-Id: Idaef76e75ffef66b37fdd67e62f0760b7ec263c3 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
| | * Doc: add docs for ScriptEngine::newArrayLeena Miettinen2015-05-271-0/+4
| | | | | | | | | | | | | | | Change-Id: I69462de7442612c35634cead37572db387031c3e Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
| | * Fix missing details output in example.Karsten Heimrich2015-05-272-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 17e29fc8d3 introduced a behavior change, the installer.components is no longer a array property, it is now a function returning an array. Update docs. Change-Id: I4fcdee6cff4572012236e1ac0768013a1e5689ac Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * Doc: update screenshots of Settings dialogLeena Miettinen2015-05-272-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Network tab changed, but I also updated the Repositories tab screenshot for consistency. Change-Id: Id6e0ffb6620449724da8093aae9816d4a02f7fe8 Task-number: QTIFW-708 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * Explain logic in dynamic page exampleKai Koehne2015-05-271-0/+4
| | | | | | | | | | | | | | | | | | Change-Id: I2e41a4f19cfb0b6dc9cad03896db6d079cf7aeee Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| | * Remove leftover. (signal and documentation)Karsten Heimrich2015-05-263-15/+0
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ib735d8e7103ade0a9c31fa3d710542cafae3c8f2 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * Doc: add docs for PackageManagerCoreLeena Miettinen2015-05-262-316/+1231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the scripting API documentation to a separate qdoc file. Where possible (no QDoc errors are generated), only link from the C++ API documentation to the scripting API documentation. Change-Id: I969e9afc5cd45c495e6c517b825abb9a9aabdd82 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
| | * Adapt LGPLv3 preamble to IFWKai Koehne2015-05-182-4/+4
| | | | | | | | | | | | | | | Change-Id: Ic4c4b8a29dcba66da28ed927d46648625ee69fae Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
| | * Fix help output for --proxyKai Koehne2015-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | Actually passing --proxy has an effect on Linux, but not on OS X. Change-Id: I29a4d3945c6113d67311fdea3c700a5610075939 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
| | * Fix archivegen recursive include of directories with filter.Karsten Heimrich2015-05-121-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Never pass recursive with true even if path is a directory, otherwise the path containing the file name part of the path is used as path to recurse and the actual file name is used as filter. For example: /path/to/doc -> Directory: /path/to -> Filter: doc Task-number: QTIFW-639 Change-Id: I60972eab0b34073b4c81a815ee83058df09d1eab Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
| | * Document -static-runtime argument for Qt 5.5 onwardsKai Koehne2015-05-122-7/+11
| | | | | | | | | | | | | | | Change-Id: Ic26cabbc42aa7247a6078f5fdf26320340a1c461 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
| | * Fix auto-test for Qt >= 5.5.0Karsten Heimrich2015-05-121-0/+4
| | | | | | | | | | | | | | | Change-Id: I8bdde116fc7721ff07f2f1eec07cfa9cf4c5620d Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * Update.Karsten Heimrich2015-05-121-0/+1
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ia49c395b0ba8cd2f8dc7932b74fe7b99f73ba190 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * Missed to register copy codec, thus failing to copy files.Karsten Heimrich2015-05-121-0/+3
| | | | | | | | | | | | | | | | | | Task-number: QTIFW-695 Change-Id: I197c9b904dfabe9f08d2344c098d8db70afd91f0 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * Replace waitForBytesWritten with flushKai Koehne2015-05-114-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately waitForByesWritten is known to fail from time to time: QTBUG-24451 . We introduced it for making sure large data is actually send, but flush() seems to serve the same purporse. The only drawback is that flush() operates on the concrete socket, and therefore needs to be called on the caller's side. Change-Id: Ic92db298b3dad2c3f9eaa47d160aec517e33e284 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
| | * Doc: link from gui C++ docs to scripting docsLeena Miettinen2015-05-081-12/+25
| | | | | | | | | | | | | | | | | | | | | Remove duplicated text, where possible. Change-Id: I6e5e81ab151817d76d53f7137e5183b12bdb04af Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
| | * Doc: link from C++ API ref to scripting API refLeena Miettinen2015-05-082-55/+88
| | | | | | | | | | | | | | | | | | | | | | | | Remove duplicated text where possible, and unify the text if it is needed in both files (by QDoc). Change-Id: If0c62a4a4abf6c1f61fd24f7947b9bc9bfb14f63 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
| | * Doc: add link to controller scripting topicLeena Miettinen2015-05-081-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: I929ced36d59f52621785e44c7d93fd24f237d590 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
| | * Doc: Fix layout issues on the operations tableTopi Reinio2015-05-081-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace a \code block with a monospace \c text, and unintended '\n' sequences with spaces, allowing the text to span multiple lines. These changes make the table more readable by reducing its width and avoiding the creation of a scrollbar. Change-Id: Iff87fe2fe1b017e88395701643d278cb868e7f04 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| | * Fix auto-test build with Qt 5.5.Karsten Heimrich2015-05-062-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Still the tst_PackageManagerCore fails here cause the expected "\t" is not expanded anymore by qDebug()... Change-Id: Ia5f9383af6b32e95a198ce612c40fe0e3db2392d Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
| | * Doc: fix code snippet in controller scripting sectionLeena Miettinen2015-05-051-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTIFW-687 Change-Id: I5690e9ebd4b8fae9f3f21b6685bec0d2c2999913 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | | Small optimizationJarek Kobus2015-06-041-8/+3
|/ / | | | | | | | | Change-Id: Ia412f036e8285375e2fc2bd3a1eb7e18edd3dbea Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Coding style cleanup.Karsten Heimrich2015-06-032-172/+193
| | | | | | | | | | Change-Id: I5761d98c88df72915195f0e004e7d380e6403eb9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Remove unused and unmaintained code.Karsten Heimrich2015-06-033-337/+2
| | | | | | | | | | Change-Id: Ieeac37893bf25279c5b0b7d3861eaec7caead120 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Use QDir::separator() instead of fixed "/"Niels Weber2015-06-011-2/+2
| | | | | | | | | | Change-Id: I9b343a6e0ad2861ffad75a7f523a731049578996 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Implemented xml:lang attribute support for DisplayName tag.Dmitry Mordvinov2015-05-085-9/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Components in tree view are often need to be localized. Therefore packages.xml syntax is extended with possibility to specify xml:lang attribute for DisplayName tag (similarly to Description one). Test data extended with root component localization. Added new testcase that changes default locale and checks that loaded component names correspond to hard-coded ones. Docs updated with new feature description. Change-Id: Ic330c3c6684e763eb48a2e99e71784913544e686 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Add constant and make use of it.Karsten Heimrich2015-05-085-5/+7
| | | | | | | | | | | | Change-Id: I3d244f112e39a57dfa769bb6a786f62b607d9b3c Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com> Reviewed-by: Christoph VogtlÃĪnder <c.vogtlaender@sigma-surface-science.com>
* | Enable feature live preview of dependenciesjkobus2015-05-0712-2/+26
| | | | | | | | | | | | | | | | | | This feature is available after setting InstallActionColumnVisible property to true inside config.xml Change-Id: I5071d5c5c4562100a96530c581de01760ca0d2d5 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Remove scRemoteVersion, it's the same as scVersionJarek Kobus2015-05-076-9/+8
| | | | | | | | | | Change-Id: I552b2f62865ff88fb6827819240b283485d0e4c7 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Remove pseudo static core instance, fixes autotests.Karsten Heimrich2015-05-068-37/+29
| | | | | | | | | | | | | | | | | | | | | | We need the core engine in operations anyway, so pass the pointer to the create function instead of setting it on our own after the operation was created. The only reason to introduce the static was the ~UpdateOperation() destructor, which now can get the value from its internal data instead of using the static instance call. Change-Id: Ide27542837355ec8c642a6687ca02977983f84fa Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Compile fix: explicit qualification in declarationKarsten Heimrich2015-05-061-2/+2
| | | | | | | | | | Change-Id: I681f1cdaf550c7756d4594f409dde39c45d54c8c Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Use QMap instead of QHash to keep the stored order on disk.Karsten Heimrich2015-05-062-22/+18
| | | | | | | | | | | | | | Some minor other changes as suggested by Jarek on cd75e52e. Change-Id: I39ad5335c0ea19821c98fa3c575a3405f2ebcda7 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Rename the files to match the class name.Karsten Heimrich2015-05-065-5/+5
| | | | | | | | | | Change-Id: I018445cbfc1d9278c549f3f56145dd12c4921000 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Rename classes to reflect their use. Remove typedef.Karsten Heimrich2015-05-0610-106/+111
| | | | | | | | | | Change-Id: I5abb64d356a0951671487b60529a0ca26b0909be Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Replace UpdateSourcesInfo and UpdateSourceInfo classes.Karsten Heimrich2015-05-0610-284/+151
| | | | | | | | | | | | | | | | | | | | | | | | Introduce a new struct PackageInfo, which is similar to the removed UpdateSourceInfo struct. The new struct name reflects the actual use better, as we deal with package here (either packages to install or updates to apply) and not updates only. Also remove the container class UpdateSourcesInfo, we can simple reuse a existing Qt container here. Adjust all occurrences that use/ used the classes. Change-Id: I526e24cbf1664f0ab0ad18153f60c2c10b6909d8 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Fix issue with accessing install target directory.Karsten Heimrich2015-05-062-27/+25
| | | | | | | | | | | | | | | | | | | | | | In case we run as installer, do not look into the installation target directory to read the package XML file. This needs only be done to get installed packages, read the application name and version to compare updates and online components against. Change-Id: Ie5b82854e41dc2f11ae5668c5839351c2fc52e04 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>