summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix InstallIcons and CreateDesktopEntry operations usage as rootArttu Tarkiainen2021-01-155-5/+20
| | | | | | | | | | | | | | | | | | | | The operations write the output files to a valid, writable directory value of XDG_DATA_HOME variable if set, otherwise defaulting to "$HOME/.local/share". This follows the XDG Base Directory Specification but misses the use case of system-wide installation: the XDG_DATA_HOME should only contain base directory relative to which user specific data files should be stored. Prefer a predefined value "/usr/local/share" when launced as root or the internal elevated admin rights handling is active. This should be a sane and well known value for applications installed system-wide, and should not conflict with files extracted by distribution's package management system. Task-number: QTIFW-2093 Change-Id: I96fab3367122e7df783697e07baeb71dfd9b3f0e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Add support for generating offline installer from onlineArttu Tarkiainen2021-01-1520-44/+633
| | | | | | Task-number: QTIFW-1945 Change-Id: Ic8a076a28385e99ad09cfbccd07c7012d6570639 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Provide tooltip texts for buttonsArttu Tarkiainen2021-01-152-0/+13
| | | | | | | | | | | The standard buttons in WizardButton enum (Back, Next, Cancel...) were omitted as they are quite self explanatory. Task-number: QTIFW-2073 Change-Id: I4a6257d2f772c781f4bbc505c03ed289cbf4f36c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Allow disabling undo in CreateLocalRepository operation during uninstallKatja Marttila2021-01-142-1/+8
| | | | | | | Task-number: QTIFW-2094 Change-Id: I1c5d86e084eac9760ac734ae62d6d7706e57dff2 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Change 'license agreement' -radiobutton to checkboxKatja Marttila2021-01-142-8/+8
| | | | | | Change-Id: I0884b9351030e3b50a6fb2bdd6234101002e5ca6 Reviewed-by: Niels Weber <niels.weber@qt.io> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Add highdpi support for watermark, banner, background and pagelistpixmapsKatja Marttila2021-01-145-52/+37
| | | | | | Task-number: QTIFW-2084 Change-Id: I4047457aae9709819f1a19ec9c74c5a88e9b7e7c Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Fix translating from component scriptKatja Marttila2021-01-144-34/+3
| | | | | | | | | Translate using QCoreApplication::translate instead of QObject::tr. Removed the use of obsolete installTranslatorFunctions() function. Task-number: QTIFW-392 Change-Id: Icdd67efb6889acd26d63297fb89945c3431c881c Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Allow disabling undo in RegisterFileType operation during uninstallKatja Marttila2020-12-303-2/+31
| | | | | | Task-number: QTIFW-2089 Change-Id: I8cccd471718eaaa6dc167a852b8854dc424f994e Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Allow disabling undo in SimpleMoveFile operation during uninstallKatja Marttila2020-12-303-16/+50
| | | | | | Task-number: QTIFW-2090 Change-Id: If0c2d4901ee1fb634e1e436ab14a507d06dd99ab Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Allow disabling undo in CopyDirectory during uninstallKatja Marttila2020-12-303-11/+43
| | | | | | Task-number: QTIFW-2088 Change-Id: Ic5e781b89b1c74fc8f65575bd46c073610545523 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Allow disabling undo of GlobalSettings during uninstallKatja Marttila2020-12-307-4/+153
| | | | | | Task-number: QTIFW-1973 Change-Id: I89f15c8ed7d56c3e1bc72d3c740e9054363f9390 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Introduce ForcedUpdate element for componentKatja Marttila2020-12-2217-19/+111
| | | | | | | | | | | Setting ForcedUpdate for component will cause a mandatory update for component if it is installed. Component must be updated before any other component can be updated/installed/removed. Essential components are updated at the same time with ForcedUpdate. Task-number: QTIFW-1565 Change-Id: I6af07fba222371e8cd161d1fec65301450077d86 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Add high dpi image support for Logo and ProductImagesKatja Marttila2020-12-216-6/+30
| | | | | | | Task-number: QTIFW-2061 Task-number: QTIFW-2060 Change-Id: Idaabb6a08f5e52aa7808de4b3ad541ae47dc4dd8 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Copy highdpi images as resource to installerKatja Marttila2020-12-212-0/+16
| | | | | | | | | HighDPI images are needed when scalefactor is set so that images don't look low quality Task-number: QTIFW-2080 Change-Id: Ic5b8db0bae31674269b01cc4dcabae7901a62793 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Tools: fix binarycreator usage with unified meta-only repositoriesArttu Tarkiainen2020-12-082-13/+36
| | | | | | | | | Also take into account the case of using both split and unified meta repositories for the same binarycreator run. Task-number: QTIFW-2051 Change-Id: I757165f4b53cf301eb0d4bc9dbc94cacc9f3859e Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Merge remote-tracking branch 'origin/4.0' into masterKatja Marttila2020-12-074-4/+4
|\ | | | | | | Change-Id: I3d61fa9873ef3f2258fd03091dea94e9e4961c0a
| * Fix wrong color in sidewidget text4.0.1Arttu Tarkiainen2020-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | Do not remove Qt::ItemIsEnabled flag from all unvisited pages as we may have skipped some. Instead do this for all pages which's id is greater than the current one. Task-number: QTIFW-2059 Change-Id: Ia66de5e1a376d33179cfee3eb7395248407aa4f1 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Shorten display name of 'Select package categories'Katja Marttila2020-12-013-3/+3
| | | | | | | | | | | | Task-number: QTIFW-2056 Change-Id: I119d2e7f8f943c3df19f4c0df58123f7bb0d0b6c Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Add option to define operations in component.xmlKatja Marttila2020-12-0755-252/+780
| | | | | | | | | | | | | | | | | | | | | | Operations can from now on be declared also in component.xml. The operations are performed, backuped and rollbacked the same way as they would be when defined from scripting api. Task-number: QTIFW-507 Change-Id: Ia509219b94737136c3de25db0cb0c72076b48380 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Remove 'Reject Licenses' radio buttonKatja Marttila2020-12-022-23/+0
| | | | | | | | | | | | | | | | | | One radio button is enough, by selecting 'Accept Licenses' the 'Next' button is enabled. Task-number: QTIFW-2057 Change-Id: I0db0fb2e85644528b4a2b4304903549d0a91ecbf Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Tools: refactor to move general purpose functionality to installer libArttu Tarkiainen2020-12-0223-377/+552
| | | | | | | | | | | | | | | | | | This makes it possible to utilize parts of our existing tooling in the offline installer from online installer generation process. Task-number: QTIFW-2048 Change-Id: I7ee605be75541cc83a3b6909089bda45f0835bcf Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Print package information in xml formatKatja Marttila2020-11-2512-317/+236
| | | | | | | | | | | | | | | | | | Also removed logging categories for package information, the full package information can be printed by increasing the verbosity level. Task-number: QTIFW-1950 Change-Id: I4bce019a63ba1fbf48e3bb0ca45511e42d4974c9 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Merge remote-tracking branch 'origin/4.0' into masterKatja Marttila2020-11-2444-86/+228
|\| | | | | | | Change-Id: If5205ff6ef2c8989520e24d41595c04d5920d207
| * Fix permissions in 'Licenses' and 'installerResources' directoriesArttu Tarkiainen2020-11-182-3/+9
| | | | | | | | | | | | | | | | | | Both directories are created by IFW so they should follow the same file permissions practice we use whenever possible. This fix also applies to subdirectories inside 'installerResources'. Change-Id: I747a7638028fb0b9ff406143a97b5100eacc2566 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| * Set "FrameworkVersion" installer valueArttu Tarkiainen2020-11-181-0/+5
| | | | | | | | | | | | | | | | This makes it possible to query for the Installer Framework version of the running installer binary from the scripting-API. Change-Id: I88fd12d081aa720cbe95683ee35714e5e2d4908b Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Update ChangelogKatja Marttila2020-11-181-0/+11
| | | | | | | | | | Change-Id: I09aba5b1ad22af3ce3826812e268a814c0dfa52e Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| * Enable HighDPI support in X11Katja Marttila2020-11-111-1/+1
| | | | | | | | | | Change-Id: I560796aa248df505a86701014a001deb90c627f2 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * Fix AppendFile undoKatja Marttila2020-11-111-0/+4
| | | | | | | | | | | | | | | | | | | | If Appendfile is done to a file in an install folder, the backup file name folder name is saved as @RELOCATABLE_PATH@. Replace the variable with actual folder when the value is read. Task-number: QTIFW-2020 Change-Id: Ibe32f9afd53fd9698c0acc14de62a641d0dd89c4 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * Update IFW version to 4.0.1Katja Marttila2020-11-104-8/+8
| | | | | | | | | | Change-Id: I084e4a80cc7d98f6ddc455dad4f8df09d01087ee Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * Repogen: Fix unite metadata when --repository switch usedKatja Marttila2020-11-1026-51/+126
| | | | | | | | | | | | | | | | | | | | United metadata 7z was missing the component which had no update available. Task-number: QTIFW-2018 Change-Id: I069fd852499f157075bf28e3ccfef3e42e5f30a9 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * CLI: Tidy up progress message printArttu Tarkiainen2020-11-052-5/+5
| | | | | | | | | | | | | | | | The debug print does not look very nice when the string contains escape characters for quotes or extra spaces. Change-Id: I9428d3aef4e3ebd693f66083447430e4e2600098 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Docs: Fix doc on gui::showFinishedPage()Martin Kampas2020-11-041-1/+1
| | | | | | | | | | | | | | Task-number: QTIFW-798 Change-Id: I9ed5bb585cc0b09cd0a17c535e7073d6e7bf4fc8 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Fix loading controller script with comment on last lineMartin Kampas2020-11-042-1/+3
| | | | | | | | | | | | | | Task-number: QTIFW-1062 Change-Id: I3deb46cae74d1e5851d4ddd4b58c0ba19375ddbd Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Fix segfault on file download error properlyMartin Kampas2020-11-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | The onError function destroys instances required later during the error message construction. This improves over the fix introduced with commit 6a93f37440a3dcc72bb5e496dac90a8f95d63eab. Change-Id: I54c4064eb225d3e3913ce5073706a5ce5717d234 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Doc: Update command line interface referenceArttu Tarkiainen2020-11-041-6/+9
| | | | | | | | | | | | | | Add missing short versions of options and '--confirm-command' reference. Change-Id: I4e4df0a7f883a97b653da1dea4dae878f4e1484c Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * CLI: Minor cleanup for commands help textArttu Tarkiainen2020-11-031-7/+8
| | | | | | | | | | | | | | | | | | | | Instead of using tabs for indentation, use the same two whitespaces as with options. Use the same format for package list arguments as in documentation. Change-Id: Id5a7d1e6bdbea6a49c560cdadb2fe3ef5793d04a Reviewed-by: Katja Marttila <katja.marttila@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| * Add missing members to PackageManagerCorePrivate member initializer listArttu Tarkiainen2020-11-031-0/+8
| | | | | | | | | | | | | | | | | | | | The lesser called class constructor function was missing initialization for some of the fundamental data type member variables. This could cause weird behavior in autotests, where a PackageManagerCore object for "fake" installers is instantiated on multiple occasions. Change-Id: I4e65453e3125cb5b4b662314a593bb0232907478 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Obey stylesheet in SettingsDialogKatja Marttila2020-11-031-0/+17
| | | | | | | | | | Change-Id: I3fa464acece6276a3c147d9b8585c7da100a3574 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * CLI: Fix wrong warning text in command 'purge' for running processesArttu Tarkiainen2020-11-033-6/+16
| | | | | | | | | | | | Task-number: QTIFW-1996 Change-Id: Iaf9aa6bfd39d266ed052838e969881c168b4b2ed Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Update IFW version numberKatja Marttila2020-11-104-8/+8
| | | | | | | | | | Change-Id: Ia170c00fcd6dd585a2e91bdc0e266dc05de90d8d Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Arrange licenses and filter duplicatesJarkko Lehtoranta2020-11-0611-26/+100
| | | | | | | | | | | | | | | | | | | | | | - Add a "priority" attribute to the "License" element used in "package.xml" for arranging licenses by priority in the LicenseAgreementPage and in CLI. Priority >0 shows the license on top of others. - Arrange the licenses with the same priority alphabetically - Filter duplicate licenses from the LicenseAgreementPage and from CLI Change-Id: I1dcacdd417d2383b8dc18149e4de329fbf11cfe8 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | CLI: Print extra archive information with higher verbosity levelArttu Tarkiainen2020-11-057-12/+69
| | | | | | | | | | | | | | | | | | | | Also rework verbosity level handling to use predefined and range constrained enumeration list values. Task-number: QTIFW-1998 Change-Id: Iaf15ca638411e6842d3d502c4d7ff11d28d06658 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Allow to set ForcedInstallation from component scriptMartin Kampas2020-11-041-8/+6
| | | | | | | | | | | | Change-Id: I7bba68f5159737971de9801012daef8aaff09216 Task-number: QTIFW-675 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Automatically uninstall unneeded virtual componentsMartin Kampas2020-11-046-2/+53
| | | | | | | | | | | | Change-Id: Ifbbfec4449a9f5b0a79269fc7ddfcc1780e762e5 Task-number: QTBUG-76210 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | CLI: Add possibility to filter installed packages with regexpArttu Tarkiainen2020-11-047-8/+23
| | | | | | | | | | | | Task-number: QTIFW-1953 Change-Id: Ie291e8ae96d46082e342e9bcb152258862813afd Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Replace obsolete qrand() with QRandomGeneratorKatja Marttila2020-11-046-8/+10
| | | | | | | | | | Change-Id: Ie61b192bcf047cc70f728ea15370ff50e7a41769 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Remove unused code blocks and functionsKatja Marttila2020-11-0415-95/+24
|/ | | | | | | | Results analyzed using cppcheck tools. Also add Q_DECL_OVERRIDE to overwrited functions. Change-Id: Iab5eb43206af0050c1dd84efb7ed860ab9594496 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* create_ifw_installer.py: Set execute bit for file4.0.0Arttu Tarkiainen2020-10-221-0/+0
| | | | | Change-Id: Id7e544f912d7c59c7c57f59680611ae52ed8a50e Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Fix ifw package versionsKatja Marttila2020-10-212-2/+2
| | | | | | | | Packages don't understand the variants, replacing those with hard coded values. Change-Id: I5a35a1f46958b4ce699a2eff117305cc2e75cbb1 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* create_ifw_installer.py: Require filename for the generated binaryArttu Tarkiainen2020-10-211-16/+4
| | | | | Change-Id: I1330a170999c0518637dd3b27ec9050382756c02 Reviewed-by: Katja Marttila <katja.marttila@qt.io>