summaryrefslogtreecommitdiffstats
path: root/src/libs
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'origin/4.0' into masterKatja Marttila2020-12-072-2/+2
|\ | | | | | | 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-011-1/+1
| | | | | | | | | | | | 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-076-8/+96
| | | | | | | | | | | | | | | | | | | | | | 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-0214-0/+3743
| | | | | | | | | | | | | | | | | | 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-259-269/+193
| | | | | | | | | | | | | | | | | | 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-249-20/+44
|\| | | | | | | 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>
| * 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>
| * CLI: Tidy up progress message printArttu Tarkiainen2020-11-051-1/+1
| | | | | | | | | | | | | | | | 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>
| * Fix loading controller script with comment on last lineMartin Kampas2020-11-041-1/+1
| | | | | | | | | | | | | | 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>
| * 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>
| * CLI: Fix wrong warning text in command 'purge' for running processesArttu Tarkiainen2020-11-032-3/+8
| | | | | | | | | | | | Task-number: QTIFW-1996 Change-Id: Iaf9aa6bfd39d266ed052838e969881c168b4b2ed Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Arrange licenses and filter duplicatesJarkko Lehtoranta2020-11-0610-25/+98
| | | | | | | | | | | | | | | | | | | | | | - 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-056-11/+68
| | | | | | | | | | | | | | | | | | | | 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-041-0/+26
| | | | | | | | | | | | 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-043-5/+12
| | | | | | | | | | | | Task-number: QTIFW-1953 Change-Id: Ie291e8ae96d46082e342e9bcb152258862813afd Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Replace obsolete qrand() with QRandomGeneratorKatja Marttila2020-11-043-4/+6
| | | | | | | | | | Change-Id: Ie61b192bcf047cc70f728ea15370ff50e7a41769 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Remove unused code blocks and functionsKatja Marttila2020-11-0412-74/+12
|/ | | | | | | | Results analyzed using cppcheck tools. Also add Q_DECL_OVERRIDE to overwrited functions. Change-Id: Iab5eb43206af0050c1dd84efb7ed860ab9594496 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Allow replacing variants in 'Title'Katja Marttila2020-10-211-1/+1
| | | | | Change-Id: If3c675f0cd76744eee63170f629633b31f7a046a Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Don't warn if maintenance tool cannot be deletedKatja Marttila2020-10-152-4/+22
| | | | | | | | | We have a deferred delete for maintenance tool as in Windows the running program cannot be deleted. Task-number: QTIFW-1979 Change-Id: I3bfd98dd1d476450b9b770c9b2f1c70810e67492 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Fix essential updateKatja Marttila2020-10-091-3/+6
| | | | | | | | | When updating essential, no other components should be installed nor updated unless there is autodepend on the essential component. Task-number: QTIFW-1970 Change-Id: If9edd6515e3e5ec51611ac07ac52b13f05983b9d Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* CLI: Add retry count limit for checking running processesArttu Tarkiainen2020-10-091-0/+7
| | | | | | Task-number: QTIFW-1974 Change-Id: I5f2c815a5fe64a2fc2d15e26ff8687b3929292d7 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Add short version for option --accept-licensesKatja Marttila2020-10-062-2/+4
| | | | | | Task-number: QTIFW-1984 Change-Id: I9e2c9302d4a21f169266b147bac618758f004fa5 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Add short version for --no-default-installationsKatja Marttila2020-10-062-1/+2
| | | | | | Task-number: QTIFW-1981 Change-Id: Ibb531dcd6e95c6dc6a17d92659736f3cab57af29 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Add missing const parameter referencesKatja Marttila2020-10-059-10/+10
| | | | | | | Results from cppcheck analyzer tool Change-Id: Ib76a53728d2774f5e7ec884e1b98d6bf98d20b21 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Add short version for --confirm-commandKatja Marttila2020-10-052-4/+6
| | | | | | Task-id: QTIFW-1980 Change-Id: Id4641406d67f377597575d1e7f9d2e6d312091a3 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* CLI: Add short versions for message query optionsKatja Marttila2020-10-052-9/+17
| | | | | | Task-id: QTIFW-1982 Change-Id: I97f51c0931f4baef5e19f0e819bd6beee186301e Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Expand the sanity check for mutually exclusive optionsArttu Tarkiainen2020-10-012-4/+22
| | | | | | Task-number: QTIFW-1744 Change-Id: I4a4fdcd2517028e05f9282c15a91a4fb83c24901 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* CLI: Add informative print when calling "remove" with no argumentsArttu Tarkiainen2020-10-011-0/+5
| | | | | | | Task-number: QTIFW-1744 Change-Id: Id44df3b5edbea5582e8ddee230c915d403271d3f Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* CLI: Give more meaningfull return value for installsKatja Marttila2020-09-253-44/+45
| | | | | | | | | | | | | | Instead of returning just true or false when running installer or maintenancetool, utilize the PackagemanagerCore status message. Added also a new status enum, EssentialUpdated, which is returned when calling command 'update' and only essential components are updated. Also fixed a bug when components could be installed even when there were an essential update available. Task-number: QTIFW-1969 Change-Id: I43826301656573b34e1338b49566d199bdcd7468 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* CLI: Prevent MT restart after MT is updatedKatja Marttila2020-09-232-4/+6
| | | | | | | | | | Command line instance does not launch properly without user interaction. In Windows, the maintenancetool was launched to the background without GUI and CLI, in Linux the CLI does not take user inputs. Task-number: QTIFW-1967 Change-Id: I5e6ebb40f7db37a70f8d0063cbe279f5cd26080b Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Change MT restart commandsKatja Marttila2020-09-231-1/+2
| | | | | | | | | 'updater' command option is deprecated, use predefined variable instead so code continues to work even if the command name changes. Change-Id: I99537bfd37dd55aeeff132b7c6ae04f9ea74d711 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Enable scroll bars on side widgetArttu Tarkiainen2020-09-221-4/+4
| | | | | | | | | | If the dynamic page list becomes too long to fit the current window height, enable scrolling instead of forcing the user to resize the window. Task-number: QTIFW-1966 Change-Id: Ifc1f1424d3e626c5378a1ed65194489387ad0bed Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Exit early when trying to install already installed componentKatja Marttila2020-09-211-1/+11
| | | | | | Task-number: QTIFW-1845 Change-Id: Iceea374ae4e027653c9e353fa2a4902e5fed790a Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Doc: Remove internal classes and structs from generated documentationArttu Tarkiainen2020-09-2155-0/+571
| | | | | | | | | | After migration to using 5.12.7 based qdoc, the generated documentation contains also empty declarations for members of undocumented internal classes. Mark them internal as needed. Task-number: QTIFW-1483 Change-Id: Iad40e4efdd098f09a825ce1c8d0aafcc76bd83bf Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Doc: Reduce the amount of documentation warningsArttu Tarkiainen2020-09-2124-51/+565
| | | | | | | | | | | | Miscellaneous fixes to missing function documentation, undocumented parameters, namespace scope etc. As 5.12.7 based qdoc gives a lot more warnings about code missing documentation, mark undocumented implementation details with \internal command. Also some spelling fixes to related parts of documentation. Task-number: QTIFW-1483 Change-Id: Ibf5d1e5098713acbd152c5b61ea4f46cc11feb4b Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Doc: Fix documentation warningsTopi Reinio2020-09-1619-177/+164
| | | | | | | | | These changes fix many of the documentation warnings when building with a recent version of (Clang-integrated) QDoc. Change-Id: I5714635a25707cd7ab7bec209fa043a95f0b9832 Reviewed-by: Katja Marttila <katja.marttila@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Fix image aspect ratio not preserved when resizing windowArttu Tarkiainen2020-09-165-4/+168
| | | | | | | | | | | As this is not currently possible using only QLabel, subclass it with a new AspectRatioLabel class to provide the functionality. This should be usable also on other places where we need scaling with aspect ratio maintaining. Task-number: QTIFW-1944 Change-Id: I32147b2b487573bb054fcf66b09eb3f8a0350ccd Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Page list widget enhancementsArttu Tarkiainen2020-09-114-6/+20
| | | | | | | | | | | | - Add support for a configurable image shown on top of the page list. - Add missing object names for easier object reference, for example when using stylesheets. - Remove the vertical line separating side widget as this looks particularly ugly on custom styles. Task-number: QTIFW-1939 Change-Id: I16e17e72163068381f54491f7fbe965eb4c5295d Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Obey --no-default-installations when default set from scriptKatja Marttila2020-09-091-6/+3
| | | | | | Task-number: QTIFW-1930 Change-Id: Ie180777a0c5dc7c6a7b4e273169e673cd5c7e918 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Remove extra space from progress indicatorArttu Tarkiainen2020-09-041-1/+1
| | | | | Change-Id: I3fe4f9879514695239a8dfa023e531b5cc400cea Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Allow setting BackgroundPixmap shown on MacStyle regardless of platformArttu Tarkiainen2020-08-311-2/+1
| | | | | | | Task-number: QTIFW-1175 Change-Id: Ifa8af022741e8f38c0692845f6fd0cf08181f0b4 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* CLI: Allow forced component to be selected for installKatja Marttila2020-08-311-1/+2
| | | | | | Task-number: QTIFW-1929 Change-Id: I4c9cc7449126b6bb8898f5148f2cb612b175f52a Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Fix crash when fetching categoriesKatja Marttila2020-08-262-0/+19
| | | | | | | | | | Component scripts are re-evaluated when new categories are fetched. Remove refereces to already added custom widgets from pages as those are re-added when scripts are re-evaluated. Task-number: QTIFW-1928 Change-Id: Iad52232920eaf3859d710d6fe06e80eeee90797d Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Allow disabling translation features with environment variableArttu Tarkiainen2020-08-261-2/+2
| | | | | | | | | | 'IFW_DISABLE_TRANSLATIONS' can be used to disable translation features with a value of '1', '0' or any other values are ignored. The variable is evaluated at the time of running qmake. Task-number: QTIFW-1911 Change-Id: I99c472eae4229b8add109fcf7f764f670909231d Reviewed-by: Katja Marttila <katja.marttila@qt.io>