summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix misc QDoc warnings4.1Arttu Tarkiainen2021-08-167-44/+56
| | | | | | Task-number: QTIFW-2253 Change-Id: Idf0216c1b4491160ee06924241bf26aaace9c883 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Repogen: Fix updating of repository from a partial package set directoryArttu Tarkiainen2021-08-165-30/+75
| | | | | | | | | | | | | | When collecting information about the paths to be compressed into unified metadata, if the package directory used to update repository was missing replacements for two or more components, it would reveal an issue with the traversing of the existing repository directory. Fix by adding the missing "cd up" after entering a component entry directory. Add new test case. Task-number: QTIFW-2287 Change-Id: Ica1228968398b6e987bdf89336f74f53fcd35d27 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* MT: Install new <ForcedInstallation> components with default check stateArttu Tarkiainen2021-08-161-1/+10
| | | | | | | | | | | | | ComponentSelectionPage::isComplete() would return false if the state of the component model was "DefaultChecked" and user had not (de)selected any new components. This change adds a condition to check if there are any ForcedInstallation components that haven't been previously installed, and allows navigating forward and installing those without additional selections. Task-number: QTIFW-2286 Change-Id: I273cc7219df1eae4e11ff23e733d71a9c297bedd Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* MT: Fix reading of StartMenuDir value from incorrect config fileArttu Tarkiainen2021-08-161-2/+7
| | | | | | | | | | | | | | | | | | Value of StartMenuDir variable should be permanent after initial installation and must be read from maintenancetool.ini, don't use the default value from internal configuration file (metadata/installer- config/config.xml) of the maintenance tool binary as it: - Does not contain the path prefix for either user or system-wide start menu directory, we add this later depending on the installation type. - May change altogether with a new configuration file if the vendor has provided an update mechanism for maintenance tool, or if the user has opted for a non-default location. Task-number: QTIFW-2284 Change-Id: Id731d151b9f0acc77aa146722d1e088ea6a47eb3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* QtPatch: Fix catching non-zero exit codes from "qmake -query"Arttu Tarkiainen2021-08-161-6/+8
| | | | | | | | | Also make the detailed output to be shown on the installation error message box. Task-number: QTIFW-2273 Change-Id: I9c678a0b382d52a6ff9ba78e0d93118714cc96ae Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Fix hang when canceling metadatajob by an external callArttu Tarkiainen2021-08-161-0/+2
| | | | | | | | | | | | | Installer may leave an event loop running in DownloadFileTask::doTask when shutting down, if Downloader::testCanceled() was not yet triggered by connection events, or by a timer timeout used to check if the user has canceled download while the connection is blocked. Fix by waiting for the tasks to finish when canceled. Task-number: QTIFW-2282 Change-Id: I8800cdb3c368da3edaf8def50e3b8e837d3e993c Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Doc: Minor function summary fix for component JS objectArttu Tarkiainen2021-08-162-0/+8
| | | | | | | | | | The "component::addDependency" and "component::addAutoDependOn" methods support also specifying a comma separated list of components in the same string parameter. Change-Id: I7f4d289d80d4efd485a0cfa64c6dda93bfc2f59a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Fix replacing of {external-link} tags in component tree view tooltipsArttu Tarkiainen2021-06-222-20/+14
| | | | | | | Task-number: QTIFW-2264 Change-Id: Ie7191ba75d923cc8d8eb353f7fac85818b87591f Reviewed-by: Katja Marttila <katja.marttila@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix usage of '--install-compressed-repository' with a relative file pathArttu Tarkiainen2021-06-181-1/+2
| | | | | | | | | | Use a function overload of QUrl::fromUserInput that takes a workingDirectory parameter, in order to be able to handle relative paths. Otherwise a string pointing to a relative local file path is handled as a short form of a HTTP URL. Change-Id: I5811661680728e79555ea7b99d0a1e8a8f294b44 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* 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>
* 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>
* 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>
* 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>
* Update side widget with the binary marker changes in introduction pageArttu Tarkiainen2021-02-191-0/+6
| | | | | | Task-number: QTIFW-2150 Change-Id: I8a216ed99aaa68347558cb90a712d2afd1147268 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Fix documentation for package directory nameKatja Marttila2021-02-191-1/+3
| | | | | | | | | | Package directory name cannot contain characters ':' or '-' as those are used as a separator for version number. This information was not found clear enough in the documentation. Task-number: QTIFW-2146 Change-Id: Id291cf821f35b7ef5b6d720c94b46f2e83c9d6d9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Fix App Error when trying to launch a running installerKatja Marttila2021-02-191-2/+4
| | | | | | | | Fixed by not deleting the uninitialized pointer. Task-number: QTIFW-2149 Change-Id: I4ed768828f6e662c63bf83550c127987205e92d5 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Documentation fixesKatja Marttila2021-02-194-1/+24
| | | | | | Change-Id: Ibb8da857319eff6119b0296375b6c38578729559 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Add unit tests for offline generationArttu Tarkiainen2021-02-1629-18/+330
| | | | | | | | | | | | This also changes some of the return values in our CLI-related functions in PackageManagerCore class to better catch cases where we exit without failing but also without doing anything. Also adapt existing tests. Task-number: QTIFW-2028 Change-Id: I73c4ca1b20d439773d0e290195f137d0d7369d17 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Fix value overwrite from command lineKatja Marttila2021-02-163-43/+56
| | | | | | | | | Key-value pairs given from command line should overwrite all common variables and custom variables saved to maintenancetool.ini Task-number: QTIFW-2021 Change-Id: I1abd8b67e6ae76051a2887965099e00344bc5cc0 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Reduce windows frame size from maximum sizeKatja Marttila2021-02-161-1/+6
| | | | | | | | | Windows frame is calculated to availableGeometry(). If wizard default height is set higher than that, the buttons remains partly unvisible under the taskbar. Change-Id: Ia0610e72fc84356e6c18d6f332a84947179d714a Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Fix DesktopDir value for AllUsersKatja Marttila2021-02-161-1/+1
| | | | | | | | | Correct value is 'Common Desktop' for AllUsers instead of 'Desktop'. Change-Id: Ice375f56401600e50d126694bbb0a7cc1bb61ad9 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* CLI: Add warning when cli-only options are used without command keywordArttu Tarkiainen2021-02-155-55/+96
| | | | | | Task-number: QTIFW-2046 Change-Id: Id1c3d24e8c385bdfbe0a7837be774f885a192aa4 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Translations: Update existing TS filesArttu Tarkiainen2021-02-1112-1445/+4202
| | | | | | | | | Some source strings have been added, changed, moved, removed, etc. over a period of time. Task-number: QTIFW-2126 Change-Id: Id84b2001f3229c02d6ebbf1e79301573c9701eb2 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Emit signal after loading default translationsArttu Tarkiainen2021-02-112-0/+2
| | | | | | | | | This makes it easier to get the load order correct, if there are translations to be loaded for additional pages from vendor extensions to the internal C++ API. Change-Id: I9e10cfa7e1cbf25f87d998157436c44425403cac Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Add possibility to move component in component treeKatja Marttila2021-02-1149-52/+472
| | | | | | | | | | | | Setting <TreeName> -tag to component.xml will overwrite the default location of component in installer's tree view. This way we can define the component location without a complete repo build. Updates.xml can be directly modified by adding <TreeName> -tag for easy relocation of components. TreeName must be an unique name - it cannot conflict with existing tree name or name. Task-number: QTIFW-594 Change-Id: Ie69f90f1303d932369d566d0d7b4bc0e354505c6 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>