summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update French translationKatja Marttila2023-09-291-11/+71
| | | | | | Task-number: QTIFW-3161 Change-Id: Ide6311f8f16885ffb10d83837b8a631658c17154 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Fix qHash return valueKatja Marttila2023-09-2911-21/+28
| | | | | | | | qHash return value in Qt6 is size_t. Making relevant changes so that no warnings occur when building with Qt5 or Qt6. Change-Id: Ia4d8de49b163a59b58ec7c1eea83979b174b1bd1 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Update terminology for dependency properties for aliasesArttu Tarkiainen2023-09-2910-49/+49
| | | | | | | | | Change "Requires" to "Required" and use plural form for the dependency properties, to be more uniform with the dependency properties for components. Change-Id: Iccb36701bc32ebafd27914272225ad1615c5f9fa Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Fix allowing selecting an alias depending on unstable alias for installArttu Tarkiainen2023-09-293-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | For the sanity check calculations, all component aliases are manually selected to detect possible errors in packaging preventing installing of an alias. As the order of install for selected aliases is undefined, in some cases the installer did not detect that an alias requires an unstable alias. Consider an example scenario: * aliasA -> requires aliasB * aliasB -> requires aliasC * aliasC -> missing from installer The unstable status is set the first time we query for the required aliases of an alias, so the case for "ReferenceToUnstable" could go amiss if the required aliases list for "aliasA" was populated before for "aliasB". Fix by populating the required aliases and components in the order of the alias dependency graph. Change-Id: Id2fc9e3e1b315f5be98ca8915a0938abad1a2eb5 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Add support for optional alias dependenciesArttu Tarkiainen2023-09-2910-50/+187
| | | | | | | | | | | | In addition to RequiresComponent and RequiresAlias, introduce new OptionalComponent and OptionalAlias properties for component aliases. The new properties are used to declare optional requirements for aliases, which do not cause the declaring alias to become unstable in case the referred component or alias is missing from the installer. Task-number: QTIFW-3166 Change-Id: I43c8cd08099e879180ec7e028b55836750c727bd Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Update Japanese translationKatja Marttila2023-09-291-9/+69
| | | | | | Task-number: QTIFW-3161 Change-Id: Ie6fbcf7e4076557c20c3a647d8cf9b21ccf02a57 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Update Portuguese translationKatja Marttila2023-09-291-11/+71
| | | | | | | Task-number: QTIFW-3161 Change-Id: If298ae73dc20e66982e43d8c859827f50b6821dd Reviewed-by: Samuel Mira <samuel.mira@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Update German translationKatja Marttila2023-09-281-8/+68
| | | | | | Task-number: QTIFW-3161 Change-Id: Ib9342314607e8df932356232280db599d80356f4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Update Italian translation fileKatja Marttila2023-09-261-53/+137
| | | | | | Task-number: QTIFW-3161 Change-Id: If718697e22f3011ff0ffe751ea757e2ca65a2e49 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Update Croatian translation fileKatja Marttila2023-09-261-53/+137
| | | | | | Task-number: QTIFW-3161 Change-Id: If1f806c751e38cb70149bcc16cf3735e4f4867ff Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Update Hungarian translation fileKatja Marttila2023-09-261-36/+140
| | | | | | Task-number: QTIFW-3161 Change-Id: I2a8a28f522ceef311f3c47fe3ab92118b484d3fb Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Update Polish translation fileKatja Marttila2023-09-261-52/+136
| | | | | | Task-number: QTIFW-3161 Change-Id: Id7bf6d97b4bfa9a2915d8a353338d50c5eef49e4 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Update Brazilian Portuguese translation fileKatja Marttila2023-09-251-47/+131
| | | | | | Task-number: QTIFW-3161 Change-Id: Ia9721dc2d7aca53321480c8df742d1ff8ffc00e0 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Update Catalan translation fileKatja Marttila2023-09-251-8/+68
| | | | | | Task-number: QTIFW-3161 Change-Id: Ia163197daca66dde18030b9cc7d2c1cde301dd71 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Fix busy indicator in Welcome screenKatja Marttila2023-09-252-2/+3
| | | | | | | | The progress did not work correctly yet in all steps. Task-number: QTIFW-3068 Change-Id: Id33f92020dcee792f35a45a3459473535404267e Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Enable building with Qt6.2Katja Marttila2023-09-2510-27/+27
| | | | | | Task-number: QTIFW-3083 Change-Id: I66f3d1feb89c683f8763c5dee587ed73a2115e04 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Fix documentation warningsKatja Marttila2023-09-253-2/+3
| | | | | Change-Id: I68ee86163c3b4d825633efce6dba9f1c0d23ed39 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Disable http2 protocolKatja Marttila2023-09-252-0/+2
| | | | | | | | | | | | By default, installer build with Qt6 enables http2 protocol. Disabling http2 protocol for now so that the behavior is the same when building with Qt5. Currently some cdn's response with "GOAWAY received, cannot start a request" -messages, the problem needs to be solved first before http2 protocol can be enabled. Change-Id: I0cad5fef4fe299d21ee66489583cd4411f6bd7c8 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Adapt to QNetworkAccessManager redirect changes in Qt 6Arttu Tarkiainen2023-09-212-2/+8
| | | | | | | | | | | | Redirect policy has changed from manual to "QNetworkRequest::NoLessSafe RedirectPolicy" in Qt 6, which broke the redirects for Downloader class. As we do manual redirect handling, change the attribute for the requests to "QNetworkRequest::ManualRedirectPolicy" in Downloader and HttpDownloader classes. Task-number: QTIFW-3163 Change-Id: Ic86c34fe404a99e6d2068109d9afe6753c5e76cb Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Fix openssl warning when running repogenKatja Marttila2023-09-141-0/+2
| | | | | | | | | All plugins has been disabled for tools, including repogen. This caused an openssl error when running repogen as it uses FileDownloaderFactory which requires openssl. Change-Id: I4913a3e826881fdc86b804baec3e13e1e5a964f7 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Add auto-tests for component aliasesArttu Tarkiainen2023-09-1411-32/+420
| | | | | | Task-number: QTIFW-2978 Change-Id: I2ed1368dbaf793f1035d93af88c4c2e73c4271b3 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Add support for component aliasesArttu Tarkiainen2023-09-1423-26/+1245
| | | | | | | | | | | | | | | | | | Introduce concept of component aliases, which act as an alternative way for referring a set of related components. Component aliases are declared in an alias definition file, which is included to the created installer's binary layout as a resource. The file lists the available aliases, including metadata - such as name, version, and description - and the list of components and other aliases the alias requires. Aliases can be referred only from the CLI for the time being, with the supported commands 'install' and 'search'. Task-number: QTIFW-2978 Change-Id: I281f171cc7d932ce496051d7090ae169a4709eec Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Add possibility to overwrite QUiLoaderKatja Marttila2023-09-133-7/+18
| | | | | | | | | So that dynamic useriterfaces can be added, for example using extensions, QUiLoader needs to be overwritable Task-number: QTIFW-3141 Change-Id: I0a3062e97c700192b9cd3e082a2517b2cfa4833d Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Update ChangelogKatja Marttila2023-09-121-0/+13
| | | | | Change-Id: I49ffa625cc354e7f8eda684c3b494d272b203c6d Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Enable blacklisted testsKatja Marttila2023-09-053-13/+0
| | | | | | | | | | The fail has already been fixed to IFW, no need to blacklist these tests any more when building with Qt6.5 Task-number: QTIFW-3087 Change-Id: I9d2a25d12cfe5fb98083826936878ce3770db0d2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Fix deprecated QCryptographichHash function callKatja Marttila2023-09-057-22/+14
| | | | | | | | | | Function QCryptographichHash::addData(const char *data, qsizetype length) has been deprecated since 6.x. Task-number: QTIFW-3077 Change-Id: I5c36d52d7e8fe4c1724072b33c1ff19e9f2fb846 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Merge "Merge remote-tracking branch 'origin/4.6' into master"Katja Marttila2023-08-247-18/+39
|\
| * Merge remote-tracking branch 'origin/4.6' into masterKatja Marttila2023-08-247-18/+39
| |\ | | | | | | | | | Change-Id: Idadf4fb3047f72880e5a86f76eb21b659589cd17
| | * Update Changelog4.6.14.6Katja Marttila2023-08-231-0/+5
| | | | | | | | | | | | | | | Change-Id: Ife1b59301536d4e2edd4cb5d159b7269b798f202 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| | * Fix crash when filtering categoriesKatja Marttila2023-08-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Components are refetch when fetching the categories, thus we need to recalculate the installable components Task-number: QTIFW-3085 Change-Id: Ie794e6308dd7f3f96814781d8e25769ecd323887 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| | * Allow setting temporary repositories for offline-only installersArttu Tarkiainen2023-08-222-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the settings button can be configured to be visible for offline-only installers, the user may configure additional repositories in addition to the embedded binary content. Those repositories were not considered for the metadata fetch, however, so components from those repositories could not be installed. Allow fetching metadata from temporary or user configured repositories regardless of if the installer is created as "offline-only". Also fix required temporary space calculation when content is installed simultaneously from both embedded to the installer binary and remote repositories. Task-number: QTIFW-3078 Change-Id: I4effa365e856ca009588ac8768f8b6c30b4b0373 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| | * DownloadArchivesJob: allow download retries for command line runsArttu Tarkiainen2023-08-213-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, on network errors or hash verification failures, the download job would be canceled when running the installer from CLI. This was to prevent infinite retries in case the automatic or default answer for the error message boxes was to retry. Add a retry counter and allow retrying the failed downloads from CLI runs until the max count is reached. Task-number: QTIFW-3098 Change-Id: Iee95f0eb4e47af89c74ffdd9ad6026bda6c87664 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| | * Update version number to 4.6.1Katja Marttila2023-08-185-18/+18
| | | | | | | | | | | | | | | Change-Id: I69af7f518c2edeb4987b03ffaf7c15efb9121689 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | | 3rdparty: update libarchive sources to 3.7.1 releaseArttu Tarkiainen2023-08-2448-378/+984
|/ / | | | | | | | | | | | | | | | | Details: https: //github.com/libarchive/libarchive/releases/tag/v3.7.1 Change-Id: Ie2e53b557df6decc3c4e49d3638d08b6529db601 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Fix deprecated QVariant usageKatja Marttila2023-08-233-20/+74
| | | | | | | | | | | | | | | | | | Also adding tests for UpdateOperations which used the deprecated QVariant functions Task-number: QTIFW-3077 Change-Id: I5b6b975631b4d0380511f614b0cad1f90a4849e8 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Fix scriptengine testKatja Marttila2023-08-221-0/+1
| | | | | | | | | | | | | | | | Evaluating scripts which has gui components needs a valid packagenamanagergui when building with Qt6 Task-number: QTIFW-3087 Change-Id: I3ac03f90cb490e7769e6af7db6f7be198ed06b8f Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Update ChangelogKatja Marttila2023-08-221-0/+5
| | | | | | | | | | Change-Id: I02c60d53838fd6659b785153849dac39f2bd2189 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Coin: Switch to the new packaging tools scripts locationPatrik Teivonen2023-08-183-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scripts were moved from qtsdk.git to tqtc-qtsdk.git. Adjust the coin instructions to use the new location. This will also update the packaging scripts, so the new macOS version with Xcode 13+ must be in use before it can be merged. With the new scripts in use, the .dmg disk image will be signed in addition to the .app bundle by default. Also, the notarization tool is switched from soon to be deprecated 'altool' to the new 'notarytool'. Task-number: QTQAINFRA-5505 Change-Id: I63046761eb19e833eed414e19c17402a5694b556 Reviewed-by: Katja Marttila <katja.marttila@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Use directory separators in path asking for process to be stoppedKai Köhne2023-08-171-2/+4
| | | | | | | | | | Change-Id: Ibda2368dfaf7d8e09d4bad6c678965866231965e Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Coin: Add instructions to install pyenv for qtsdk.gitPatrik Teivonen2023-08-172-11/+12
| | | | | | | | | | | | | | | | | | Make sure that the Python version specified for qtsdk.git can be installed if it is not found on the system. Change-Id: If8b84c16e137c91009d72f05a4b9dd46b5c0f32a Reviewed-by: Katja Marttila <katja.marttila@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Start using Qt 6.5 branch with IFWHeikki Halmet2023-08-174-2/+15
| | | | | | | | | | | | | | | | | | This also blacklist test function loadComponentUserInterfaces Task-number: COIN-1050 Task-number: QTIFW-3087 Change-Id: I7c59570b07a54b50898ef0c1bf23ff83540f36bd Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Reintroduce custom documentation build targetsTopi Reinio2023-08-176-15/+132
| | | | | | | | | | | | | | | | | | | | | | Documentation build targets have been removed from Qt 6 when building with qmake. Reintroduce custom targets to call qdoc, qhelpgenerator, and qtattributionsscanner via 'html_docs' and 'docs' targets. These are adapted from similar targets once used by Qt Creator. Change-Id: If572b709c56860a9949c1f4a5ae66a660e2a621e Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Allow generating offline installers from GuiArttu Tarkiainen2023-06-195-6/+79
| | | | | | | | | | | | | | | | | | | | | | This was previously possible only from the CLI. The same methods can be used from the graphical installer, so we do not need to limit the feature for CLI users. Task-number: QTIFW-3072 Change-Id: I271aecf163528b922e6cc399d31f07218e2a1650 Reviewed-by: Katja Marttila <katja.marttila@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Show progress on Welcome screenKatja Marttila2023-06-192-1/+2
| | | | | | | | | | | | | | | | | | | | Cache integrity checking takes some time in Windows and progressbar showed nothing. This caused an illusion that installer did nothing. Adding a busy indicator to progress bar. Task-number: QTIFW-3068 Change-Id: I1c685bf1e2ac4d2fca5db49054f7369d90f24480 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Fix deprecated QString::count() callKatja Marttila2023-06-151-1/+1
| | | | | | | | | | | | Task-number: QTIFW-3077 Change-Id: I595309e3e354f4eb96b10fd23420ca70f0f6ee9e Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Fix deprecated QV4::Object::getIndexed() function callKatja Marttila2023-06-151-1/+1
| | | | | | | | | | | | Task-number: QTIFW-3077 Change-Id: I9e4906a033f683b619c6cbf0140b695c71162fdf Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Fix deprecated QApplication::fontMetrics() function callKatja Marttila2023-06-151-3/+3
| | | | | | | | | | | | Task-number: QTIFW-3077 Change-Id: I9229166c0717e42a99f4a48da94728ebba3d06f7 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Fix deprecated QMessageBox::setButtonText() callKatja Marttila2023-06-151-1/+1
| | | | | | | | | | | | Task-number: QTIFW-3077 Change-Id: Id8b1947efbc6a2cdf33e080f01024170820617b9 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Fix building in macOs with Qt6Katja Marttila2023-06-132-1/+2
| | | | | | | | | | Change-Id: I167034b2c6f6d248bbee8a8fdd9bf5abae73144e Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Fix page title text on the last pageKatja Marttila2023-06-1217-34/+34
| | | | | | | | | | | | | | | | The page title text did not match the text located in the sidebar. Task-number: QTIFW-3060 Change-Id: If435aeb0b2ddbdcafed43c4da61702f3d5bf7688 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>