aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '6.2.0' in qt/qt5v6.2.0Qt Submodule Update Bot2021-09-255-0/+0
| | | | | Change-Id: I7a7252751d9cc351a5d78ed94af5154e861a5fd8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2.0' in qt/qt5Qt Submodule Update Bot2021-09-2535-0/+0
| | | | | Change-Id: Ie8e2d877d5ca65cc31aaba113f20701e0e13aabb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2.0' in qt/qt5Qt Submodule Update Bot2021-09-2335-0/+0
| | | | | Change-Id: Ib03cbd4d8823223b166114ea2e487ddbd73ee9f2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2.0' in qt/qt5v6.2.0-rc2Qt Submodule Update Bot2021-09-2135-0/+0
| | | | | Change-Id: I24e678b4a4eb628c3101502ce4d3a32a17e78625 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2.0' in qt/qt5Qt Submodule Update Bot2021-09-211-0/+0
| | | | | Change-Id: Idd65c0ed9da1e8a162c5b6a9516b2dfcca9a0128 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2.0' in qt/qt5Qt Submodule Update Bot2021-09-1935-0/+0
| | | | | Change-Id: Id72a07fc3804bbb915367abff486b1f9c7233949 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2.0' in qt/qt5Qt Submodule Update Bot2021-09-191-0/+0
| | | | | Change-Id: Ic3c9c12f9262c0c5a0bf7d09149146d4a2e6d6b1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2.0' in qt/qt5v6.2.0-rc1Qt Submodule Update Bot2021-09-1434-0/+0
| | | | | Change-Id: I3c8b4abbff31fa7f595da56e0238e3a8610431d4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2.0' in qt/qt5Qt Submodule Update Bot2021-09-137-0/+0
| | | | | Change-Id: Id7f68d2fd346ff4a483879f7e2f2e0f6dfe160ef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix M2M module branchesJani Heikkinen2021-09-131-3/+3
| | | | | Change-Id: Ib5f30b9b96af1bafba72775c3d8c55f898187b51 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* Update submodules on '6.2.0' in qt/qt5Jani Heikkinen2021-09-131-0/+0
| | | | | Change-Id: Ic1423e1f6582fa18c4cef70dad89fd9a9efa280f Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update submodules on '6.2.0' in qt/qt5Qt Submodule Update Bot2021-09-1234-0/+0
| | | | | Change-Id: I2919dfcb783d4eef8a9b51527ec741fa8a2f6d54 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2.0' in qt/qt5Qt Submodule Update Bot2021-09-1135-0/+0
| | | | | Change-Id: Ic2db19708421b63d2f12f152bbb397fce1887406 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Provisioning: Update the Integrity toolchain versionHeikki Halmet2021-09-081-2/+2
| | | | | | | | Task-number: QTQAINFRA-3555 Change-Id: I2a1f25024862b0b96bb7675376520d2e3a679d0b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit f320433979bdc5a17618d8fcb140bf0e8ab04503) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Adjust submodule branchesJani Heikkinen2021-09-081-36/+36
| | | | Change-Id: I57ff0bdb21eaa15434f223d1481be9dc862b841f
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-09-0735-0/+0
| | | | | Change-Id: I986062980c44c646e92924d94dc8092a1cd65726 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add '-DFEATURE_gds=OFF' as a non-qtbase configure argument for macOS ↵Jani Heikkinen2021-09-071-1/+1
| | | | | | | | | | | | packaging host We need to disable GDS feature to solve OpenSSL library linking issue Fixes: QTBUG-93759 Pick-to: dev Change-Id: I3625c06b14c633d77f1628ae0cda3092284eabd6 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Make Integrity significantHeikki Halmet2021-09-071-1/+1
| | | | | | Task-number: QTQAINFRA-4285 Change-Id: I131e6af26a28012228178192e60e2a91d33959fe Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* COIN: Fix integrity target configure argumentsSimo Fält2021-09-061-1/+1
| | | | | | | Change-Id: I624feea29eb70dadb9e959d6056eaccd73b7169a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 9385d5d687045a589105d691c839608aec8161f3) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-09-0434-0/+0
| | | | | Change-Id: I9b6f54949bcafcf8026e51e799d2492dc3f4a317 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add Integrity target for other modulesKimmo Ollila2021-09-033-3/+10
| | | | | | | | | QtDeclarative, QtImageFormats and QtShaderTools Change-Id: I24906d833d364a80025663928650f032a8618c22 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit dd24bc25c9d897b944768db3ebe52f8d68c8f6da) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Add Integrity target for QtSvgKimmo Ollila2021-09-031-1/+4
| | | | | | | Change-Id: Ic677c932151aeed9f72e49baba9038bf122e5b5b Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 401ef8a8b3424a0271f64bc35c9c47884e6c1c4f) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Add Insignificant flag for IntegrityHeikki Halmet2021-09-031-1/+1
| | | | | | | | | We will add new module targets for Integrity. Those are not tested during Qt5 integration. Let's remove the flag after we are sure that nothing will break on those new targets Change-Id: Ifdcecc869a931897e377281618dfce744353b47e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Make Integrity platform config as a cross compile targetSimo Fält2021-09-031-4/+8
| | | | | | | | | | | | While there was no target os value, COIN thinks that it is a normal desktop target. This causes the host and target artifacts being copied to wrong location. Change-Id: Ie478f66e424859fbbf51d3f2d9d7efba032b30c5 Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit b5c4effe7ef55b6b4c0d337a40b5a9823f807bbf) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-09-0335-0/+0
| | | | | Change-Id: Ibc0860c74a72a87dd3a6215649bc5cd756e4eaad Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5v6.2.0-beta4Qt Submodule Update Bot2021-09-0235-0/+0
| | | | | Change-Id: Icb82129f238d41a99cc59c6b53d0aab37a04f0d1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add a platform config file for Qt Application ManagerRobert Griebl2021-09-021-0/+3
| | | | | | | Change-Id: I59013a841e96eb679798e906af4c1af09884dc45 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 2b22f80725b80702bba6c67f512352bdd67dcee2) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Build minimal subset of tests in qtdeclarative desktop static buildsAlexandru Croitor2021-08-271-1/+2
| | | | | | | | | Task-number: QTBUG-87580 Change-Id: I417dbfc9b9b3092c9c14227907db4f1c16124ef1 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit f0c766419558f5ee6b58345528cd24e64e88c500) Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* iOS: Build a subset of tests when targeting iOSAlexandru Croitor2021-08-272-1/+14
| | | | | | | | | | | Currently will only build tests/auto/cmake projects in qtbase. More work is needed for the other repos. Task-number: QTBUG-95839 Change-Id: Ie1aa6deb202c9b84ce0c14b0f851f38a3a71fe7b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 4fea3be3af5e436d96ecaaa80c49ecd96ead316f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Coin: bump Android build tools and platform sdk level from 29 to 30Assam Boudjelthia2021-08-265-10/+10
| | | | | | | | | | | | | Google requires target SDK level 30 for apps that can be accepted to the Play Store. This change goes together with bumping the default target sdk in qtbase (from 29 to 30 as well). Ideally, build tools should be kept up to date as well anyway. Change-Id: Iac58b7250d7cb639a4d760cf12e7630c9d0b77cc Reviewed-by: BogDan Vatra <bogdan@kdab.com> (cherry picked from commit 6ac98447b588fc4b739cea4cecb2a32ee1f91378) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Upgrade Xcode and Command line tools to the latest version for Big SurHeikki Halmet2021-08-242-4/+4
| | | | | | | | | | Latest version is 12.5.1 Change-Id: I86111d5fdab6e06201f1184bbd23806d25eed192 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit f824365cb5d48a990b06132fa5f34d3d7803d59e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdp: remove system dependenciesSamuli Piippo2021-08-231-1/+1
| | | | | | | | | | | Use more of the same arguments as RHEL-8.2-host to limit the unnecessary dependencies to the system libraries. Task-number: QTBUG-95882 Change-Id: Ibc5b1755aca7bfef42fd7ca3db0d19ebd49b8e4e Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-08-2035-0/+0
| | | | | Change-Id: I729fb6acd74ad1d366a12c6919868654d8df7218 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* COIN: Re-add qtsdk.yamlEike Ziller2021-08-191-0/+6
| | | | | | | | | | | That is used by our Jenkins setup for packaging. To keep things simple, just include the cmake_platforms and Qt Creator's config. Change-Id: I13425f08c2f51a1522da25804fc7883f8d817059 Reviewed-by: Antti Kokko <antti.kokko@qt.io> (cherry picked from commit bbd31689ec603550e01fdc17794d728e30cc289e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-08-1935-0/+0
| | | | | Change-Id: I85d2b2185329ec189baac4a7b5c93bdb63484c43 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update node.js to 12Allan Sandfeld Jensen2021-08-182-3/+3
| | | | | | | | | | For Ubuntu it means using an alternative packages, for openSUSE not using an alternative package. Change-Id: I09085428db083adc1ff1d68f384cd19c83605bfd Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit c4b8c908b6796b1cfe4d2712bc6bb014b2eae8eb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Provisioning: Install 32bit version of Ninja on WindowsEike Ziller2021-08-171-2/+2
| | | | | | | | | | | | So it also runs on 32bit Windows. Ninja upstream switched their binary builds to 64bit with Ninja 1.7, so we need to provide our own. Amends e8b0be77118e9ee6bec3887807cb7e37d334c0a3 Change-Id: Id3329ca481b7743b4d40dad8faaa62285dbe53b0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit f945fdc735c65e18f9cc9fff17efa6ba225851f7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-08-1735-0/+0
| | | | | Change-Id: I89c18397efc86bdf62a11c439a99627b03033b32 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '6.2' in qt/qt5Qt Submodule Update Bot2021-08-1736-0/+0
| | | | | Change-Id: Iae77e867f60ba639acde4187708786611d5b5a4c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove qtgraphicaleffects from .gitmodulesJoerg Bornemann2021-08-162-6/+0
| | | | | | | | | | | | | This repository has been merged into qt5compat. Change the 'recommends' field of qtquickcontrols2 from qtgraphicaleffects to qt5compat. Fixes: QTBUG-95228 Change-Id: I07ad4302c874e25673b7644cc9b7f2b24cca3833 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit cec25d2ac62137b9a869f36cda10db43558c215d) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* 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>