summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Translations: reshuffle existing .ts files with updated source stringsHEADmasterArttu Tarkiainen2021-06-2313-1654/+1601
| | | | | Change-Id: I0dfafd7fac5e66793b34883f17a6d08684679c31 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Translations: validate and update translatable user interface stringsArttu Tarkiainen2021-06-2314-34/+34
| | | | | | | Task-number: QTIFW-2245 Change-Id: Id9a79c7c572dc588c05ad37c67ae3f0431fa7cdb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Translations: update source strings in .ts filesArttu Tarkiainen2021-06-2213-0/+52
| | | | | Change-Id: Iec5ee6a8eb522a0a70afbba80a0161d27e545c9a Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Merge remote-tracking branch 'origin/4.1'Arttu Tarkiainen2021-06-176-72/+94
|\ | | | | | | Change-Id: Iff5a7a99afca53305c7f404a74f210f67728dd54
| * Coin: Unify package filenames with other Qt releasesArttu Tarkiainen2021-06-171-5/+5
| | | | | | | | | | | | Task-number: QTIFW-2252 Change-Id: Icbcc61efb34c29a2bb2d0a7b01f2e3bad4d5ddd6 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Load and install translations as early as possibleKatja Marttila2021-06-172-56/+59
| | | | | | | | | | | | | | | | | | | | | | | | This will ensure that any early error messages are translated if there are any translations for them. Such as the already running instance string. As a result this means that a check if the installer is already running is done slightly later to allow the loading of the translations first before checking. Fixes: QTIFW-1888 Change-Id: I75ef22d98ca4de9a05e7dd485b5afed5652529bc Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * Load control script also when using CLIKatja Marttila2021-06-163-12/+24
| | | | | | | | | | | | Task-number: QTIFW-2268 Change-Id: I61e5f7963a55dcdc25aff171523fe078af309785 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * Doc: add note about limitation with CreateShortcut on WindowsAndy Shaw2021-06-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | Due to a limitation with the AllUsersStartMenuProgramsPath, Windows drops the arguments to the target and the Description set. It never reports an error and also appears to have the arguments set, so we have no way of catching the problem and trying to workaround it. Fixes: QTIFW-2257 Change-Id: I28e7a2e0733b462ab759797e61afdbae4be4b04f Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Fix translation loaded -signal when language defined in config.xmlKatja Marttila2021-06-081-0/+2
| | | | | | | | | | | | | | | | | | IFW user can define the used language in config.xml. defaultTranslationsLoadedForLanguage -signal was not sent in that case. Task-number: QTIFW-2266 Change-Id: I8b5abb532b50982e0f6b845251462cc1fef99b9c Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * Fix loading translations with upper lettersKatja Marttila2021-06-081-1/+1
| | | | | | | | | | | | | | | | | | Translations are read from resource. The file name must match case sensitively so that resource loading will succeed. Task-number: QTIFW-2265 Change-Id: Iabc899b99bbbed346ff8e7395af82545e9079eb2 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Clarify required user actions when there is an essential updateArttu Tarkiainen2021-06-161-0/+4
| | | | | | | | | | | | Task-number: QTIFW-2244 Change-Id: Ib3c717eb7fd76bdc928072630177c71933e8aef1 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Patch the windows documentation buildSimo Fält2021-06-032-10/+34
| | | | | | | | | | | | | | | | While we can't build qdoc within static build, we have to extract it separately to be able to use it. Change-Id: Ifa97edd9cc197cdc7f765e2323f1149cb29e9990 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Replace product_dependencies.yaml with dependencies.yamlToni Saario2021-06-032-3/+13
| | | | | | | | | | | | | | This allows depending only on required modules. Change-Id: I4a1664786c25797a6cd4081efbd92e10faf9d168 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Merge remote-tracking branch 'origin/4.1'Arttu Tarkiainen2021-06-0215-30/+113
|\ \ | |/ | | | | Change-Id: I86049138466399411ba36791330f4a94faad8c52
| * Update Changelog4.1.1Arttu Tarkiainen2021-05-211-0/+10
| | | | | | | | | | Change-Id: Ie0df7b2b85a9392e9895862e76ccc72cf1cc9edd Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Update IFW installer generation instructions version numbersArttu Tarkiainen2021-05-211-11/+11
| | | | | | | | | | Change-Id: I3c2c0788f700267d636c5a250a6d46ab51d99903 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Add possibility to list components with regexpKatja Marttila2021-05-216-9/+37
| | | | | | | | | | | | Task-number: QTIFW-2225 Change-Id: I6a7fdfc1070ad54d520563cae7d2446e97e2e87c Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * Update IFW version numberArttu Tarkiainen2021-05-214-6/+6
| | | | | | | | | | Change-Id: I5f8c22cd22356f6c256ce7e53db65a6a43717a19 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Add documentation for translation usageKatja Marttila2021-05-071-3/+23
| | | | | | | | | | | | | | Task-number: QTIFW-2217 Change-Id: I15af0ac81842db386bb8d86b4a76bdd45722b4a9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * Fix component translation loadingKatja Marttila2021-05-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Component translations were following the system language although allowed languages were set in config.xml using <Translations> field. Also the translation file name was not correct as IFW languages has the syntax 'ifw_<language>'. Task-number: QTIFW-2220 Change-Id: I6a6f19351cbb956accbc22bc532f7a12dde21a2f Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * CLI: Print warning when creating over 4GB installers on WindowsArttu Tarkiainen2021-05-041-1/+9
| | | | | | | | | | | | | | Task-number: QTIFW-2199 Change-Id: I56f3663ae605b2c568925702e06c4438e11830ac (cherry picked from commit 35f79da9cb99c7c0456f002829dc0fdfe55b4f8d) Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Remove wayland dependency from Linux binariesKatja Marttila2021-05-031-0/+14
| | | | | | | | | | | | | | | | | | | | Wayland dependency is added to installer binaries if it is found from system at build time. Added explicit dependencies only to xcb and minimal platform plugins. Task-number: QTIFW-2067 Change-Id: I0b65ef10824122c7041f1aa566d7a989aa085503 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * Fix declaration order mismatching initializer list in SDKAppArttu Tarkiainen2021-05-031-1/+1
| | | | | | | | | | | | | | The compiler issued a -Wreorder warning for m_core & m_runCheck. Change-Id: Id55d40132e41ab3c92f192d469bce095941a3acf Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Fix values overwritten by maintenancetoolKatja Marttila2021-04-303-9/+19
| | | | | | | | | | | | | | | | | | | | | | Maintenancetool has saved values, which are loaded after installer has initialized some values, overwriting the installer initial values. Fixed so that only values that are not already set in installer init will be set from maintenancetool ini file. Task-number: QTIFW-2218 Change-Id: Ide6a3f67daec81fe22d6dcde1e95a28f5ed2c53a Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * Do not try to remove non-existing package information file on rollbackArttu Tarkiainen2021-04-261-4/+3
| | | | | | | | | | | | | | | | | | | | | | The installation information XML file (components.xml by default) is not yet written to disk when downloading archives. Canceling the installation here would try to remove the not-yet-created file unconditionally. Task-number: QTIFW-2213 Change-Id: I922ffd7d1344755ed7fcf3f02e83bc02e789cd17 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Fix return value for operations run as detachedKatja Marttila2021-04-211-1/+3
| | | | | | | | | | | | | | Task-number: QTIFW-2210 Change-Id: If02422317039cc7aced3ff175576660cb260a005 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | CLI: Print warning when creating over 4GB installers on WindowsArttu Tarkiainen2021-04-271-1/+9
| | | | | | | | | | | | | | | | Task-number: QTIFW-2199 Change-Id: I56f3663ae605b2c568925702e06c4438e11830ac Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | COIN: Update IFW installer versionKatja Marttila2021-04-221-11/+11
| | | | | | | | | | Change-Id: Ib2fdc876282cb28f8a3bd98288c201ccd72fa269 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Translations: update source strings in ts filesArttu Tarkiainen2021-04-2013-110/+303
| | | | | | | | | | Change-Id: Ic5f32d7c18f728166500a480cf854b6ffae2ce82 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Fix updating visibility of the QToolBox widget on ComponentSelectionPageArttu Tarkiainen2021-04-191-0/+1
| | | | | | | | | | | | | | | | | | Using a stylesheet with transparent background property for most widgets revealed the page's QToolBox widget and its children were not hidden properly when category layout was hidden. Change-Id: Ic710b348c50edef823d27eccd6092d531da24bf9 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Merge remote-tracking branch 'origin/4.1'Arttu Tarkiainen2021-04-1411-14/+61
|\ \ | |/ | | | | Change-Id: I8adecc4573134d2b33f2b98fba9372320b2f8737
| * Sign only generated IFW installer4.1.0Katja Marttila2021-04-082-10/+16
| | | | | | | | | | | | | | | | | | | | | | IFW binaries cannot be signed as then the end executable is signed making it impossible for users to sign their own installers with their own keys. This change also exports IFW tools, examples and docs for online repository usage. Change-Id: I5094c50ea804854ba619216b03f6dc25ebedee57 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| * Fix segfault when selecting non-existing component from scriptArttu Tarkiainen2021-03-281-0/+5
| | | | | | | | | | | | Task-number: QTIFW-2195 Change-Id: Iaf75d4a4ff20f20a36c0b2d21abb3969b86b5a84 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * CLI: Calculate required temporary and installation disk spaceArttu Tarkiainen2021-03-282-2/+10
| | | | | | | | | | | | | | Task-number: QTIFW-2197 Change-Id: I63a0bb265105f5a722ab8c645fa3511328bbcb33 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * CLI: Fix offline installer creation with empty component meta-archiveArttu Tarkiainen2021-03-237-2/+30
| | | | | | | | | | | | | | Task-number: QTIFW-2189 Change-Id: Ic6f56156194039cca7bebf095fad8c1fc66fc275 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Reorder ComponentSelectionPage widgetsArttu Tarkiainen2021-04-132-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the category widget from the leftmost column in the page as it takes a lot of horizontal space, and we don't utilize the empty space below it. Add a QToolBox widget to the rightmost QGridLayout column to display either component information or repository categories at a time. If category widget is not shown, display the description widgets directly on the page's QGridLayout without the tool box. Task-number: QTIFW-2096 Change-Id: I04266789e3e4b7ce352b7e0a7230ab80c5e295ce Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Offline-generator: Fix duplicate package entries in internal Updates.xmlArttu Tarkiainen2021-04-1224-35/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a somewhat rare case, it is possible that a same package exist in multiple repositories. The latest available package from remotes is used - however if we select that package for inclusion and also implicitly get some other package from the another repository it exists in with an older version (autodependency, etc.), that repository is then also used to parse package information, and we store a duplicate entry of the package to the Updates.xml to-be-written to the offline installer binary. Fix by appending only the package with the latest version to the PackageInfoVector object used to temporarily hold the package information. Task-number: QTIFW-2190 Change-Id: Icdb3dc979153dfada37fdb0aabb3c718bc8aedff Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | CLI: Add support for additional filtering of search resultsArttu Tarkiainen2021-04-0910-12/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search command results can now be optionally filtered with the '--filter-packages'-option, which takes an unspecified count of key-value pairs that contain the desired package information element and a regular expression used to find matches in the element. Example usage: 'installer --fp "Version=1.0, Description=Some text" search *' Only the packages which match all given filter rules are included in the output print. Task-number: QTIFW-2168 Change-Id: I788b065d95952b988489c36db80b3c859b970f05 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Use pkexec to start the headless process used for privileged operationsArttu Tarkiainen2021-04-091-219/+15
| | | | | | | | | | | | Task-number: QTIFW-1794 Change-Id: I3225da785d52f0631b84341a4fe3d3db0fc0a171 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Merge "commit 29ed7cb3ca2e1caeb56eabba327442ce0ccadbf6 1616145450 -t--sp"Katja Marttila2021-03-2211-38/+2949
|\ \
| * \ Merge remote-tracking branch 'origin/4.1' into masterKatja Marttila2021-03-1911-38/+2949
| |\ \ | | |/ | | | | | | Change-Id: I2b2ec3606eb50d390da6e59391c0e17a31e08c54
| | * Update ChangelogKatja Marttila2021-03-161-0/+41
| | | | | | | | | | | | | | | Change-Id: Ief73309a0fafb2b4a88bfa633edba19e684459f4 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| | * Add installer generation to make_instructions.yamlKatja Marttila2021-03-125-2/+103
| | | | | | | | | | | | | | | Change-Id: Ief0885c94e7497de834e6f6de14bd485244e8ab0 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| | * Emit signal when components are recalculatedKatja Marttila2021-03-122-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | This signal is needed in QtInstaller when we want to track components which are unstable. Task-number: QTIFW-2172 Change-Id: I464d7ad9373089d5001f442ad69a076579ee3228 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| | * Doc: include example of --confirm-command option usageArttu Tarkiainen2021-03-051-2/+7
| | | | | | | | | | | | | | | Change-Id: I980a03da17dc766d2ad070332bc5a8f2328fb000 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| | * Update translations for GermanAndy Shaw2021-03-051-34/+49
| | | | | | | | | | | | | | | | | | Change-Id: Ia5e003d4b6db40d1a58bac1af48566cab2126abe Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| | * Fix test runningSimo Fält2021-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently it is not enough to unset the MAKEFLAGS for jom. It still was running test in parallel and trying to write results to same file. Change-Id: Id0c968dde4c2d005e71a1895e3d2190e8685f3ec Reviewed-by: Katja Marttila <katja.marttila@qt.io> (cherry picked from commit 4687686a64057618e58931912b8a12997fa0f1a3) Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| | * Add Arabic translationKatja Marttila2021-02-261-0/+2740
| | | | | | | | | | | | | | | | | | Task-number: QTIFW-1425 Change-Id: I474eba5c9b46fed94408dd255ee2ebcc58b894b0 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | | CLI: improvements to 'search' and 'install' command outputArttu Tarkiainen2021-03-1110-19/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously subcomponents of a virtual component were shown on search results, and trying to install these would print a bit vague message: 'Component not found'. As the sub-branches of virtual component nodes are hidden on GUI, we should also hide them when using CLI search, and give a more appropriate error message why the component cannot be explicitly selected for installation, if the user still tries to do so. Also some minor refactoring to the handling of supplemental information about binary type of the running installer/mt. This change does not fix the possible case of an install script changing the 'virtual'-state of a component, as it would require downloading and evaluating the full metadata for repositories (or components), which would impose a performance penalty to search. Task-number: QTIFW-2168 Change-Id: Ibacaca23c38f5ea98967955d91849cefc1f11f61 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | | tst_CLIInterface: remove unused repository contentArttu Tarkiainen2021-03-1117-5/+0
| | | | | | | | | | | | | | | Change-Id: I787b6ae58a01af1d8be5f3504e561982cf8acc0c Reviewed-by: Katja Marttila <katja.marttila@qt.io>