summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add alternative option where to read the installer-framework sha1Iikka Eklund2016-01-041-1/+9
| | | | | | | | | | | | | | | | | The "--version" uses the sha1 of the git checkout of the installer-framework. This works when making the build from git checkout. For Coin (continuous integration) the installer-framework builds are made from stored src packages where the .git directory is not present. In this case read the sha1 from the .tag instead which is present in the Coin produced src packages. Change-Id: Ic6387c844699f4410c043a4df84727bb5c1108ae Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Add sync.profileIikka Eklund2015-12-301-0/+6
| | | | | | Change-Id: Iab18aa118911d8a6b6b352e958e6b301e55d4a70 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Add .qt-license-check.exclude and .qt-license-check.optional rulesIikka Eklund2015-12-302-0/+2
| | | | | | | | | | | | | | | Installer-framework has two imported third party modules. src/libs/7zip: - Do not attempt to check for license headers for these files, use exclude filter. src/libs/kdtools - If license headers exist then check those i.e. optional. These files are contributed by KDAB. Change-Id: Ie3c7507c0386680ae84987628291a9612590a4f7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Update license headersIikka Eklund2015-12-29369-1340/+1450
| | | | | | | | | 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>
* Fix target directory check for reserved words on WindowsAndy Shaw2015-12-071-1/+1
| | | | | | | | | If the directory starts with "Con" etc then it is still ok to use, it is only if it is /Con or /Con/ that it is not allowed. So the extra check to be sure has anything after the reserved part is included. Change-Id: I72e0e0f98167f29da54cb627e75cd1814c3f9706 Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
* Use QQmlV4Function to correctly get empty parameters from script.Karsten Heimrich2015-11-267-58/+177
| | | | | | | | | By using QQmlV4Function to get the parameters, empty strings passed are correctly kept as empty and not null. Task-number: QTIFW-724 Change-Id: I592e2230e574ba82e765bd0079964db29452b2e9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix errors when running updates in a directory requiring elevationKai Koehne2015-08-202-2/+2
| | | | | | | | | | | | | | isWritable() is not a reliable way to check for permissions on Windows. Instead, just try to create a file. The alternative would be to set the magic qt_ntfs_permission_lookup variable to 1. Anyhow, this might slow down things and cause other regressions ... Task-number: QTIFW-746 Change-Id: I1b5637670bfcfe29966f0545ce2c6b1f663a9738 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Doc: Fix the function name in Controller Scripting page.Takayuki ORITO2015-08-111-1/+1
| | | | | | | | Callback was not written in the function name. It is targeted for 'Start Menu Directory Page' section. Change-Id: I8e206caf29865e1e01defddc1fb9ae60c5f85632 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Fix usage of system proxy with credentialsKai Koehne2015-08-052-1/+14
| | | | | | | | | | | | | | So far we've been using the entered credentials only for custom proxies on Windows and OS X. If one selected 'System Proxy' we asked or the credentials, but tried again without setting them. This fixes a regression introduced in 2.0, where we started to interactively ask for credentials. Task-number: QTBUG-46547 Change-Id: If059a9c68a0976db0453abdc795d9546c4b3aa4a Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Update ChangeLogKai Koehne2015-06-301-0/+2
| | | | | | Change-Id: I4e72da86a559165ca6471945103df4509e21ff08 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Unify handling of translationsKai Koehne2015-06-304-21/+63
| | | | | | | | | | | Mimic the logic implemented in installerbase/QTranslator::load() by - using QLocale().uiLanguages() - splitting up the locales into candidates (first en-US, then en ...) - implicitly assuming the default is English Task-number: QTIFW-390 Change-Id: I294288d5fc739ebf12c93a0e1a43d613b3834721 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Init all components with proper install actionJarek Kobus2015-06-291-1/+1
| | | | | | Task-number: QTIFW-727 Change-Id: Iae9d232310370fefc0c9dca771e6b2cca6b5b433 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Version bumpKai Koehne2015-06-165-8/+13
| | | | | | Change-Id: Ic11a894ef21f4dd2967a3fd662fad8a30f11ba7e Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Fix: .dat file gets deleted after multiple component changes.Karsten Heimrich2015-06-111-0/+6
| | | | | | | | | | | | | | | | | | | | We can close the .dat file in maintenance mode. There is no need to keep it open since no packages are in there and resources are mapped into memory anyway. Fixes commit 7f2c98c8 that updates the .dat file on soft restart. On Windows updating did not work cause the .dat is opened and locked by the OS. To overcome locked files we run a VB script that does a deferred rename once the lock is gone, but in case of a soft restart we now did start several of them depending on the amount of restarts. That had the undesired effect of several replace/rename operations, of which only 2 "succeeded": - First script: Remove .dat | Rename .dat.new -> .dat - Second script: Remove .dat | no .dat anymore... Task-number: QTIFW-689 Change-Id: Ic3ee1b418890eabe5b854dc7879cd7bc118f9240 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* 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>
* Fix dynamic build.kh2015-04-281-3/+3
| | | | | Change-Id: I3df834c1938e991b0c3bc07d9caf272c5a2a8507 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix dubious warning about RequiresAdminRights tag.kh12015-04-273-11/+5
| | | | | | | | | | | | | The tag was added once component script is parsed and we did know that addElevatedOperation is called from script. However, the initial commit 7ccd0acdcf35b957e9e7d04cd81902bac362ad04 did not append the node to the parent package update node. Now we decided to have the option statically and declarative available, so we can remove the warning. Task-number: QTIFW-670 Change-Id: I8cd8f702391d7bf80fc4c42074e1fd6d2d4abc57 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Don't modify check state of autodependent component when Select AllJarek Kobus2015-04-241-1/+1
| | | | | Change-Id: Id50fc5fa3460ffda62102019b46923b01b8e8745 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add more logging categories.Jarek Kobus2015-04-244-15/+28
| | | | | Change-Id: I1c7dabfd16a69ef5a3e5aaa490036de061f1fd13 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Enable logging categories as an installer option.Jarek Kobus2015-04-248-13/+47
| | | | | | | | | | | Now by default all categories are disabled. They get enabled only in verbose mode. Verbose mode enables all categories by default. Categories can be filtered using logging-rules option. Change-Id: I9324826a6e2d7a746e3d7369747fcd31a42b84b6 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add more explanations on warnings we issue.Jarek Kobus2015-04-241-0/+27
| | | | | | Change-Id: I7fea8d8c5ebc1ffea78635c335a0740c648b8e2e Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add a missing warning about auto dependency on component with childrenJarek Kobus2015-04-241-5/+10
| | | | | | Change-Id: Ib17fb2d48059ecc5b7f3b466661aad8e9d6b4b33 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix hang and errors when sending big packages over the socketKai Koehne2015-04-241-3/+9
| | | | | | | | | | The assumption that packages of arbitrary size can be send is apparently wrong on Windows. Also, one has sometimes to call waitForBytesWritten, otherwise the data is never transferred. Task-number: QTBUG-45625 Change-Id: I8b5a2584d4d42cf33d1d6688b0e17c44c325ac53 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* RemoteObject: Do not use processEvents()Kai Koehne2015-04-241-9/+1
| | | | | | | | | | | | | Replace the hand-written calls to processEvents() with socket->waitForConnected(). It's unclear why this wasn't done in the first place (maybe to keep the UI responsive when the IFW was still single-threaded)? Anyhow, this allows delivery of spurious events too, which can lead to weird hang-ups. Task-number: QTBUG-45625 Change-Id: I0ff2b85c05d0cc9d0102cf13791935be83c10536 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>