aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove qtquickcontrols2.yaml from platform_configsv6.2.0-beta3Mitch Curtis2021-08-141-5/+0
| | | | | | | | Task-number: QTBUG-95173 Change-Id: If7470b3d5cd5721def97fd5b41e46e037cec2286 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 9b3411da8d3aa769e80a71c5da3674dfa87be76c) Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* CMake: Update provisioned CMake to version 3.21.1Alexandru Croitor2021-08-144-12/+12
| | | | | | | | | Task-number: QTBUG-95018 Task-number: QTBUG-95229 Change-Id: Ibed6ff323ca1633444ed29423ce1e94c99e68f77 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 9218d50a6e207bc976569573d3449c319dcbd333) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve OpenSSL provisioning on macOSTor Arne Vestbø2021-08-131-9/+16
| | | | | | | | | | | | | | | - Make the script idempotent - Use local architecture instead of hard-coding x86_64 - Set deployment target to 10.14 - Improve logging by not building with --silent - Don't install manual pages - Allow custom install prefix (for testing) Change-Id: I728a2595987db0568568bbb8ca8117effca73997 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit f8fab3be9b2f8baf2d3810bce8a28d48ba1f3518) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Daniel Smith2021-08-1333-0/+0
| | | | | | Change-Id: I9f2c3a616edae0ed4f033e76a85a00ea7ab7c40f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Recommend qtimageformats for qtdeclarativeMitch Curtis2021-08-131-1/+1
| | | | | | | | | | qtquickcontrols2 uses it. Task-number: QTBUG-95173 Change-Id: I6a721f34545656069e91bde9c69b0af976b07e60 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 204d92c244aade12f2bddd3a7107f0462180c4e3) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove qtquickcontrols2 submoduleMitch Curtis2021-08-132-11/+4
| | | | | | | | | | It's now a part of qtdeclarative. Fixes: QTBUG-95416 Change-Id: I2e308914aa0c97608534187737b6d5ea596f100c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit ed7a7e75ffc9f9a949d3e3d484a7c69aeed116f5) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Change locale to en_US and install all available language packagesHeikki Halmet2021-08-122-0/+4
| | | | | | | | | | | | These are needed for Android tests Task-number: COIN-727 Change-Id: Id12a75da2b4485ba5d655ceb0b7c7d6426f2b4cd Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit beb8fcca5fea9f693cc96a429bd2532c1bc81ebd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove qtgraphicaleffects.yaml from platform_configsAlexandru Croitor2021-08-121-3/+0
| | | | | | | | Task-number: QTBUG-95757 Change-Id: Ia83795bbc2ddef9532fd196d64776571e50c1d6c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 1256b4d50452ee317eee263487e61ccf65cdb089) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove qtquickcontrols from .gitmodulesJoerg Bornemann2021-08-102-10/+3
| | | | | | | | | | | | | This repository is not available in Qt6. Every repository that recommended qtquickcontrols already recommends qtquickcontrols2. Change-Id: I30980bbbe9ca495f12dc591a693ebc3a4a6a01bc Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 149cc2ebc026b279e7b9a3cbc361a71cf2966c67)
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-08-0326-0/+0
| | | | | Change-Id: I0c36c5156827e4751ba4a9ff12c6a16894a8e5f5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-2936-0/+0
| | | | | Change-Id: I54aedf453b786db519e77da9a314545f08a37266 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-281-0/+0
| | | | | Change-Id: I3bbb725876e9f8f5acd9f651a771f28cc55f063b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Manually update qtwebengine to unlock CI for pyside-setupSimo Fält2021-07-271-0/+0
| | | | | Change-Id: I95862a0e46f44de94dc3926e805a2bf7df3a6e9a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* CMake: Remove CMake minimum version check in top-level projectAlexandru Croitor2021-07-271-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | The check is done in qtbase instead. Trying to do it in the top-level project is cumbersome due to needing to know whether it will be a static or shared Qt build. It's also cumbersome because the top-level build used to use qtbase's minimum cmake version values and that can get awkward to handle with submodule dependency updates. Replace the check with a regular minimum required call. The minimum version is 3.16 and the upper range value for NEW policy assignments is 3.20, while 3.21.0 is still kind of fresh and has some AUTOUIC issues. As a drive-by, add a clarifying comment about QtAutoDetect.cmake. Task-number: QTBUG-95018 Change-Id: Ifb4ec0b4ed7f56ab0179feb79072c93d1d66ce63 Reviewed-by: Craig Scott <craig.scott@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 4180e9c5111faae9b242253e2ab215154174507d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5v6.2.0-beta2Qt Submodule Update Bot2021-07-2535-0/+0
| | | | | Change-Id: I12fe7bb75d07e89d4c25ac5d366bb011ec76e872 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-2436-0/+0
| | | | | Change-Id: I3b34c0b29ce2daba3433e5daa9ef3379a4087fa7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Provisioning: Install ninja 1.10.2 for Windows and macOSAlexandru Croitor2021-07-232-6/+6
| | | | | | | | | | | To avoid error 'too many path components' when building Qt on Windows. Task-number: QTBUG-95286 Change-Id: I122cfddc8c19201f4c04fde94d051c5e1278c040 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit e8b0be77118e9ee6bec3887807cb7e37d334c0a3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-2336-0/+0
| | | | | Change-Id: I66530634e78280ed50b2036428df0f29176788c2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-2236-0/+0
| | | | | Change-Id: I1fbf348a2ce336d230c67cc8ed03fae05d725f29 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-2136-0/+0
| | | | | Change-Id: I91aab3d9a572326775c0a2c37383d77918984893 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-2136-0/+0
| | | | | Change-Id: Ic85a2785a837d73507e866a2f3a3b1b29f21ea54 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-2035-0/+0
| | | | | Change-Id: Idc0e457695645fc8fed9a93ca83ee5437f25a1d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-2036-0/+0
| | | | | Change-Id: I5e0d932100ae441de15fa7346311b9165c4ed4c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Coin: Add tqtc-qmlcachegenplus configuration fileUlf Hermann2021-07-141-0/+3
| | | | | | | | Change-Id: Ie66b837e95339ff6837ebfa83797716233bb8145 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit fab470c190bbceb85b1afc9794b085e57b069f1d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-07-1336-0/+0
| | | | | Change-Id: I7e358268f00769e5acd31546a31df315bab4908d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Update provisioned CMake to version 3.20.5Alexandru Croitor2021-07-094-19/+19
| | | | | | | | Change-Id: Id09eedf75b02b28dd94b0e3f858a05ebe8875679 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit d7c2951de0bf7c0ab5f99b46686285765f3729f2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add qtwebengine dependencies to provisioningAllan Sandfeld Jensen2021-07-064-5/+18
| | | | | | | Change-Id: If2cc949ce0669281d65995175480ac7cbd9fad74 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 3f551fedd6d4553dc9187b2aaaaf8fb10a15f03a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove qtpurchasing submodule from qt5v6.2.0-beta1Assam Boudjelthia2021-07-012-7/+0
| | | | | | | | | | | | | Qt purchasing was not part of Qt 6, and will be moved as a demo/example under qtdoc, thus we don't need it here. Task-number: QTBUG-84776 Change-Id: Ie6f704e72914072e7e105763ffaeae1d13cff086 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> (cherry picked from commit eb16fe519f21c1c60bcbbadf5a318d0765ded166) Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Add correct version for prebuilt OpenSSL AndroidHeikki Halmet2021-07-011-2/+2
| | | | | | | | | | | | | | Script was pointing to incorrect version and the prebuilt version was missing from cache. OpenSSL Android is now rebuilt and cached. Pick-to: dev Pick-to: 6.1 Pick-to: 6.0 Pick-to: 5.15 Pick-to: 5.12 Task-number: QTQAINFRA-4501 Change-Id: I31db800fa6814c3e7c1e649e2bbe3e3c80b9f4ce Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-06-3035-0/+0
| | | | | Change-Id: I47b98b1e84927a50f99dbda1832d14d2a70a7345 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-06-3036-0/+0
| | | | | Change-Id: I83f3659feace8cd95ef1208886602b4a0734059c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove qtandroidextras.yaml from platform_configsAssam Boudjelthia2021-06-291-3/+0
| | | | | | | | | | | | Following qtandroidextras removal in the commit 912fdda4a4e817ec89c24da3238af600a4fbae9e, coin's platform config yaml file has to be removed. Task-number: QTBUG-84382 Change-Id: I8c3bc89938315ae8361d8d89ec6543d3699440ed Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit f1fcb89f268a4e617514731b1a50334d63eca342) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-06-291-0/+0
| | | | | Change-Id: I2a38867ad47eb01b5f1a1e65988469ac13aa3089 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Build QDB without icu or system doubleconversionSamuli Piippo2021-06-281-3/+3
| | | | | | | | | ... to avoid unnecessary dependencies. Pick-to: dev Change-Id: I607f034d5b092e69e7d2aead4c0747268b690a5d Reviewed-by: Toni Saario <toni.saario@qt.io> Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-06-2636-0/+0
| | | | | Change-Id: Ic310607b215a1ca819f2145ffd965f282f05507b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Make QtMultimedia depend on shadertools and recommend qtquickcontrols2Lars Knoll2021-06-251-2/+2
| | | | | | | | | | Multimedia needs shadertools for building, so make that explicit. Some examples use Qt Quick Controls, so we recommend that as well Change-Id: If067defe371dc9584634d1c1aa7c5eae74c9af25 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> (cherry picked from commit 4131439fb9635cac602a0783abd594e8e7e50f2e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing wasm target build for windows and macOS hostsJani Heikkinen2021-06-252-26/+44
| | | | | | | | | | Based on wasm maintainer these should work already Change-Id: Ifa9606546e6d04be824d5507306a8c6fb5f2d035 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit bae9580da1c35b47fc46e465b5b24c84737d073c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-06-2336-0/+0
| | | | | Change-Id: I82c549410e7c80d76975e9faaf5966d29cd75e28 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Provisioning: update Squish packagesTanja Remes2021-06-222-10/+7
| | | | | | | | | | | Custom packages for Qt6.2. macOS:use custom build Qt5.15 package with separate Squish server adjusted for Qt6.2 Change-Id: I25ed60f8ec9e3fdf919e5003f52a58cdca14e633 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 1c17b656e0c7b3f5fae598a0915fdebfeb822dae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5v6.2.0-alpha1Qt Submodule Update Bot2021-06-2237-0/+0
| | | | | Change-Id: I05b348aa027e333e47301ad9186368c8cb9a16ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update Yocto toolchainsHeikki Halmet2021-06-181-12/+15
| | | | | | | Pick-to: dev Task-number: QTQAINFRA-4459 Change-Id: I0a6144db1ca1ceb35791749bf5b056ced2307ab9 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Switch back to RedHat 8.2 for Android targetHeikki Halmet2021-06-181-1/+1
| | | | | | | | | Timeout increased so this should be ok to move back to Redhat 8.2 Pick-to: dev Task-number: QTQAINFRA-4415 Change-Id: Iece9aefcbfdade2e29f495039de1f1fcafec2caf Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Archive global and config from qtbase in doc buildToni Saario2021-06-161-2/+10
| | | | | | | | | | | | Copy the global and config folder from under qtbase to directory from which the documentation.tar.gz is created. This is similar to how these are added in qmake builds. Task-number: QTBUG-94443 Change-Id: I1dfd6dd05057bb1bfdaeec9cf5d03fbfe474a5d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 7ed6d04410d5f6d1db2a92332baadf0e42b81f40) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* WoA: Build both release and debug configs for Windows on ARMAlexandru Croitor2021-06-161-1/+1
| | | | | | | | | | | | The config is marked as Packaging, but it didn't specify the list of CMake configurations to build and defaulted only to Debug. Task-number: QTQAINFRA-4492 Change-Id: If75eaf76d386442355c45e4705fe2f4c0eeaa086 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 52eebe8a892bfb9f2cd2070147f6f9100c02468a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add static platform targets for qdbSamuli Piippo2021-06-161-2/+29
| | | | | | | | Static host platforms with packaging enabled. Change-Id: I137bde6ccefb960282c5a830eb3862f03ee2f5f5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Toni Saario <toni.saario@qt.io>
* Remove qtandroidextras submoduleAssam Boudjelthia2021-06-152-8/+2
| | | | | | | | | | Remove qtandroidextras from the submodules list of qt5 since it's not part of Qt 6. Task-number: QTBUG-84382 Pick-to: dev Change-Id: Ib95fa4c759c1135b7e0cde9b54ddd334a2f7d382 Reviewed-by: Simo Fält <simo.falt@qt.io>
* coin: Make macOS on ARM developer-build tests significantTor Arne Vestbø2021-06-152-3/+14
| | | | | | Pick-to: dev Change-Id: I2cc95e955fb313131dbef56028332b611d5dba7d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Remove Insignificant flag from Windows ARM targetHeikki Halmet2021-06-141-1/+1
| | | | | | | Pick-to: dev Task-number: QTQAINFRA-4452 Change-Id: I049dfb8df259fed40438ee08b339507bda3ed768 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix qtmultimedia statusJani Heikkinen2021-06-141-0/+1
| | | | | | | | It has to be addon Pick-to: dev Change-Id: Ideafe810c032be9fdff6fae8cefb438204f61be8 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Restore qtmultimedia as a addon in qt5.gitJani Heikkinen2021-06-122-1/+0
| | | | | | | | | | According to plan Qt Multimedia will be back in Qt 6.2 so let's add it in official builds Task-number: QTBUG-93129 Pick-to: dev Change-Id: I57363932aa461210cac806fa24cc2fe9b6951391 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 07:17:19 +0000