summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* Replace hand-rolled doc targets with ones provided by QtTopi Reinio2020-09-168-146/+143
| | | | | | | | | | | | This helps to provide correct include paths to QDoc as it requires them from 5.11 onwards. Add a custom module header that pulls in the required header files into the doc build. Change-Id: I857ec5cd49e6c6c586baed6f1e39f2e9ceb900b4 Reviewed-by: Katja Marttila <katja.marttila@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Doc: Fix documentation warningsTopi Reinio2020-09-1620-212/+198
| | | | | | | | | 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>
* Repogen: Fix repository generation for empty package dirKatja Marttila2020-09-161-2/+6
| | | | | | Change-Id: I5be59799b399fe8bd6655fcf6d7f6efdf5aa5f53 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Page list widget enhancementsArttu Tarkiainen2020-09-116-6/+25
| | | | | | | | | | | | - 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-094-7/+14
| | | | | | 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-312-1/+14
| | | | | | Task-number: QTIFW-1929 Change-Id: I4c9cc7449126b6bb8898f5148f2cb612b175f52a Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* GUI: Hide detailed verbose with lowest verbose levelKatja Marttila2020-08-271-1/+2
| | | | | | Change-Id: I96628f5bdd056c6118f6d14178b6c0b7dd776ecd Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Update ChangelogKatja Marttila2020-08-261-0/+8
| | | | | Change-Id: Iae052c020a86ebaae57a6278dc734c80505adbeb 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-263-4/+9
| | | | | | | | | | '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>
* Add command line interface documentationArttu Tarkiainen2020-08-253-4/+300
| | | | | | | Task-number: QTIFW-1724 Change-Id: Ief40dc548e93cd189e3b3ca016652c8641face1e Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Revert "Modify repository category functionality"Arttu Tarkiainen2020-08-257-85/+46
| | | | | | | | | This reverts commit 99cbbd439ea1f572b4242d77035b0da3a27c79ec. Reason for revert: The speed benefit gained by converting existing online repositories to use unified metadata does not offset the penalty of fetching all categorized repositories. This is especially bad on Windows where install script evaluation takes long time. Change-Id: I03f4ab41f21e139b40c82baf741b2459966d6d43 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Add support for vendor set image decorationArttu Tarkiainen2020-08-2510-3/+125
| | | | | | | | | | | | Add possibility to show an arbitrary number of product related, or other images on PerformInstallationPage. These can be specified in the installer configuration file, using <ProductImages> element with one <Image> child element for each file name. Task-number: QTIFW-1900 Change-Id: I2be727d9189963ef1a79046150111dd8c91153c6 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Add verbose levels and cleanup log categoriesKatja Marttila2020-08-2429-140/+152
| | | | | | | | | Setting several verbose switches enables more logging and performs component checking. Also cleanup some logging categories and unify the rules. Task-number: QTIFW-1914 Change-Id: I9195f4bb02affaa87e66cf9023a3512e65e0645b Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* CLI: Ask user confirmation before performing installer actionsArttu Tarkiainen2020-08-2110-6/+51
| | | | | | | | Also add new option --confirm-command to skip the interactive query. Task-number: QTIFW-1834 Change-Id: I1c63fd990431c792a523da7047637f54b193bee6 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Call value() to get a QStringList and not values()Andy Shaw2020-08-201-2/+2
| | | | | | | | | values() returns a QVariantList which has a single QVariant in it which represents the QStringList. So to get the actual QStringList we should call value() on the data so it can be convertable. Change-Id: Ie60889d25b1e03415624fcb2c57117fa7c326efa Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Documentation fixesKatja Marttila2020-07-039-63/+124
| | | | | | | | Added missing documentation and fixed warnings. KDUpdate documentation not added in this commit. Change-Id: Idc0b167bed95b7ae4a46a350290fdb241aa94448 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Do not print progress indicator when forwarding output to a fileArttu Tarkiainen2020-07-035-3/+29
| | | | | | Task-number: QTIFW-1770 Change-Id: I2f3a8b440b89328fa3d183b1102d6a6db213fd3b Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Modify repository category functionalityArttu Tarkiainen2020-07-037-46/+85
| | | | | | | | | | | | Remove conditions for checking whether a category containing a certain repository needs to be enabled when fetching & parsing metadata for that repository. All categorized repositories will now be fetched regardless of their enabled state, that will be only used to hide/show individual components in the view. Task-number: QTIFW-1821 Change-Id: Id0dbaed9c5b460bf0faeebd6e45349f0c07d10c2 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Add possibility to add custom widget from script to certain positionKatja Marttila2020-06-255-17/+48
| | | | | | | | | | | If several custom widgets are added to same page, the order of the widgets is arbitrary. Added a new member to addWizardPageItem which can define the position of the widget in the page, relative to another custom widgets. Non-custom widgets are always placed on top as before. Task-number: QTIFW-1847 Change-Id: Iadafef3a08e60a8b05b959cb06caea2a2042b419 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Add function to get information if default install is performedKatja Marttila2020-06-255-0/+20
| | | | | | Task-number: QTIFW-1847 Change-Id: I737b9b527c25e089386f74038b57a83f3d7e2062 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Add possibility to select/deselect component from script using coreKatja Marttila2020-06-256-6/+45
| | | | | | | | | We might not have componentselection page visible, so we need a possibility to select/deselect components also using core. Task-number: QTIFW-1847 Change-Id: I85ccf0602144f843c15ef7c0818ba435d36bdac5 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Fix branch for used reference license headersSimo Fält2020-06-231-1/+1
| | | | | | Change-Id: I6183ed99c7fd90e6fdad138a6294e22fce7fe3ca Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Require both SHA1 and MetadataName elements for united metadataKatja Marttila2020-06-161-17/+11
| | | | | | | | | Installer can fetch either meta per component or meta per repository. Fetch meta per repository only when both MetadataName and SHA1 elements are found, otherwise fetch meta per component. Change-Id: Ic6d687525c74d5870cec991dea9dedf765b2df03 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Generate unique metadata name for unified metadataKatja Marttila2020-06-112-5/+24
| | | | | | | | | | | If the metadata name is the same although the package is updated, it might cause problems when pushing the data to distribution systems that requires a filename change in order to replicate content. If the filename stays the same it may not be refreshed to the cache. Task-number: QTIFW-1838 Change-Id: I2fc8c1cdf559dab89b57a74ebbe758cdc71da29c Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Add a page list widget to installer wizardArttu Tarkiainen2020-06-119-10/+217
| | | | | | | | | | | | | | | | | | | | If an installer is configured with <WizardShowPageList> set to true (default), a QListWidget set as a side widget for the wizard will be shown. The list should indicate completed and incomplete pages and the current wizard page. User navigation is not enabled in this change. The page list should honor the visibility of individual pages and update itself dynamically. In addition the visibility of a page in page list widget can be set internally with setShowOnPageList() which overrides other factors when hiding a page. The page item title shown on the list can be set internally with setPageListTitle() for the PackageManagerPage object, or the item can alternatively use the normal page title and the object name. Task-number: QTIFW-1755 Change-Id: I8a792d957a10e2176de5f42f29b1282e8e7667db Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Fix united-metadata creationKatja Marttila2020-06-103-72/+75
| | | | | | | | | | | | Creating repositories caused sha mismatch detect if installed with IFW version 3.2 or lower. Also changed the behavior that without any switches both united and component metadata will be created. --unite-metadata will create only one combined metadata and --component-metadata the old style where each component has their own meta 7z file. Change-Id: I60d3b56217917739fb8115771af8c3bcf9e59f43 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Reintroduce removed --checkupdates and --updater as deprecated optionsArttu Tarkiainen2020-06-105-5/+37
| | | | | | | | | | | These should be only provided for backward compatibility and be hidden from help text. Task-number: QTIFW-1791 Change-Id: Iff92bdf0be425edf724d3bcd3984458eca5f8ff2 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Refactor maintenance tool writing conditionsArttu Tarkiainen2020-06-1010-53/+87
| | | | | | | | | This change fixes a bug caused by a blocking runInstaller() call in PerformInstallationPage::entering() and also contains refactoring to related parts of code. Change-Id: Ic3309707c1f975a646937aa96fc407a3e5931359 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Fix InstallAction type when updating componentsKatja Marttila2020-06-082-6/+17
| | | | | | | | | | | | Components should be selected for update using model, not components own check state so model values stay in sync. Wrong InstallAction type will cause component to think it will be installed when that is not the case. This caused problems in install scripts when trying to figure out if component is going to be installed or not. Task-number: QTIFW-1830 Change-Id: I367f476de96f27b27d74e06a6fb630f0876924d2 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Merge remote-tracking branch 'origin/3.2' into masterKatja Marttila2020-06-081-0/+2510
|\ | | | | | | Change-Id: If0a57022c82cf303fc7be387e0ecf8f581478181
| * Catalan translation for IFW 3.23.2Josep Ma. Ferrer2020-06-021-0/+2510
| | | | | | | | | | | | | | Update Catalan translations for IFW 3.2 Change-Id: Id3ab2f454db41f3da93c700798b7e99d7158ddd7 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* | Add function to enable button click with objectnameKatja Marttila2020-06-045-0/+33
| | | | | | | | | | | | Task-number: QTIFW-1707 Change-Id: I8574ef96df6a00e577549342d4a4336207dcd9ec Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Obey --show-virtual-components in cli searchKatja Marttila2020-06-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | Virtual components cannot be installed unless --show-virtual-components is used. For the same reason, don't show the virtual components in search unless --show-virtual-components is used as otherwise user might miss that he is trying to install virtual component. Task-number: QTIFW-1828 Change-Id: I5a0492f6894596ed2cfb7ce438bbf55e89799c31 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Fix const correctness for CLI license acceptance functionsArttu Tarkiainen2020-06-032-4/+4
| | | | | | | | | | Change-Id: If3fdafc982c8f2180fc15529bba1bd408d9fbfee Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Remove orphan PackageManagerCorePrivate::runUpdater() functionArttu Tarkiainen2020-06-031-1/+0
| | | | | | | | | | Change-Id: I045bdd030277eb192d08749bd0208ac5d6d7a52c Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | CLI: Do not run updater if there are no updates for selected componentsArttu Tarkiainen2020-06-012-2/+14
| | | | | | | | | | | | Task-number: QTIFW-1818 Change-Id: I13dceeeaf294c689a90fbe5fe74586d7a117ea50 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Fix CreateShortcut path when running updateKatja Marttila2020-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | CreateShortcut operation is written to dat file. When updating the component, the operation is already containing the correct start menu value, so adding the start menu path is needed only when running installer. Task-number: QTIFW-1816 Change-Id: I7f60b07b21217c59ff2f419c3e92478c82d42445 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Remove unnecessary autoRejectMessageBoxes() callsArttu Tarkiainen2020-05-281-4/+0
| | | | | | | | | | | | | | | | | | These were apparently added as a stop-gap measure to prevent message boxes from blocking CLI operations before the proper message acceptance features were implemented. Should not be needed anymore. Change-Id: I5591487840fd278eea4b3e46bce0ede66d055d15 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Inform if trying to uninstall virtual componentKatja Marttila2020-05-276-0/+45
| | | | | | | | | | | | Task-number: QTIFW-1811 Change-Id: I333d6d0bd93f8538919f172113b7039b63491492 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Disable message acceptance and file query options on GUIArttu Tarkiainen2020-05-272-36/+42
| | | | | | | | | | | | | | | | | | | | Also add "command-line-only" remarks for the rest of the options that are only supported on CLI to their help description. Task-number: QTIFW-1789 Change-Id: I08cc27dee4eb4aad7a2e5c2721c56ae524766955 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Update ChangelogKatja Marttila2020-05-271-0/+40
| | | | | | | | | | | | Task-number: QTIFW-1809 Change-Id: I2c91c6e1b010a2f27afca2bdbe7ef6b039f542da Reviewed-by: Katja Marttila <katja.marttila@qt.io>