aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/wip/cmake' into devSimon Hausmann2019-12-1321-31/+216
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges merely the provisioning changes needed to perform cmake builds in the CI. The platform configuration changes will be applied incremental as we merge support in the individual modules. Conflicts: coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh Added ninja to coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh just to force re-provisioning. Removed module_config.yaml because that breaks license check in qmake builds. Change-Id: Ic074c0c881404f4361e61f66130c0cb07f5e8b84
| * Update vcpkg snapshotAlexandru Croitor2019-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | The snapshot uses the previous snapshot as a based. It was rebased on latest master as of 2019-12-05, and also contains cherry-picked patches to target iOS. Change-Id: I9fc0c39856fdb255533f6c71d27f5749894b6bea Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-12-112-0/+0
| | | | | | | | | | | | Change-Id: Ia8dbab68e5a7dd4f136e6345d6c1da9705d4be69 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-12-101-0/+0
| | | | | | | | | | | | Change-Id: I8a50e284b785b7441826ed4f199a5db4c2be6f6e Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-12-071-0/+0
| | | | | | | | | | | | Change-Id: I0c29a5b3944a20d6652c0c8cb1199abae9683f93 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-12-041-0/+0
| | | | | | | | | | | | Change-Id: I45dd7a0b0a93a35aa3f528617efeaa2859f9ce6e Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on 'wip/cmake' in qt/qt5Alexandru Croitor2019-12-031-0/+0
| | | | | | | | | | | | Change-Id: Id725f04bc4753fc68a9bbb2762beb2c5f4eb9d84 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-12-031-0/+0
| | | | | | | | | | | | Change-Id: Ia5837cb7f71ea98b280b66998f7a3624750dde6e Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Qt CMake Build Bot
| * Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-11-293-0/+0
| | | | | | | | | | | | Change-Id: I0a261abad505b2f2724f0a15a10708b67129ffbf Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Correct branches for .gitmodulesLiang Qi2019-11-291-2/+2
| | | | | | | | | | | | | | This amends eabc1ed5bd46a7882c5b98a19716e3b9aef694fa. Change-Id: Ifbcf5dc593d25d210b652b72e5563fb8e1a1ec5f Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on 'wip/cmake' in qt/qt5Liang Qi2019-11-2912-0/+0
| | | | | | | | | | | | Change-Id: Id0fb114e7d4e4bc66d8a51e91ebc8de166229fb6 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update CMake to version 3.16.0-rc4Liang Qi2019-11-293-12/+14
| | | | | | | | | | | | Change-Id: I4fc1f412888e1915ae2110320c18fb39a9600b94 Reviewed-by: Qt CMake Build Bot Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Merge remote-tracking branch 'origin/dev' into wip/cmakeLiang Qi2019-11-2834-45/+401
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the Windows config to use MSVC2019 instead of 2017 to circumvent the issue that vcpkg is building libraries with the latest compiler it finds (MSVC 2019), but Qt is building with 2017. Conflicts: coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml coin/platform_configs/qtsaferenderer.yaml Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
| * | Update qt5.gitLeander Beernaert2019-11-255-1/+1
| | | | | | | | | | | | | | | Change-Id: Ie922b8e2989215de4efd3596e6532b201a3e7d0c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-11-162-0/+0
| | | | | | | | | | | | | | | | | | Change-Id: Ia7d77b5f456e4e6196cacc179952e104476d968f Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Add a few more ported repos to qt5.git wip/cmakeAlexandru Croitor2019-11-154-3/+3
| | | | | | | | | | | | | | | Change-Id: I9f7215d3df0ba07af337262dd5e43bfc79e0a97a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-11-141-0/+0
| | | | | | | | | | | | | | | | | | Change-Id: I28901d350b1f16b9a6b3d9776ee8055ea3356ade Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-11-134-0/+0
| | | | | | | | | | | | | | | | | | Change-Id: I26274b1707fd4d12a4da5503b9a414414f29148b Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Bump vcpkg to a new snapshotSimon Hausmann2019-11-133-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some patches were upstreamed and this beings the version in line with what we need for Android. This patch also centralizes the version into a shared file, for future use. Change-Id: I90973f9bfcbc1bfeb2d11e2ee7a7fa4e4f6a58a2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update CMake to version 3.15.5Leander Beernaert2019-11-123-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Update required as there's a bug with setting the CXX_STANDARD on android. Updating to this version fixes the issue. Change-Id: I50b0bc2941e0919232b46bbf5b28133149878649 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Merge remote-tracking branch 'origin/dev' into wip/cmakeSimon Hausmann2019-11-11316-28584/+1956
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml coin/platform_configs/qtbase.yaml coin/platform_configs/qtdeclarative.yaml coin/platform_configs/qtsaferenderer.yaml coin/platform_configs/qtsdk.yaml coin/provisioning/common/linux/cmake_linux.sh coin/provisioning/common/windows/cmake.ps1 Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-11-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I140d2692932cc10d4bedd45e149c804ec7329885 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-11-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I41c2406329c56d6c82a3d7c27b364adae366b79f Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-11-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie50bc298a4743b348ad91d9f4efee97482ec55a4 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-11-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifd37d952b51fe8c37d4ff2b99efec21c87d52f8c Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-311-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I84f7dfd1bcbfe889c5f3e4861297f661d50aa393 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-301-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I51d0e6deeb53b1eabe2796dc958ebf9cf536e8f7 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Add x11extras to the qt5 buildSimon Hausmann2019-10-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iac7273717b7dff510c79cd6151349e6ddb6a5e56 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I23f2cf4a7577df02e3e7b8590aede4d755117cb1 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-281-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib2187b662c55268f101640b32c98cf9cd325a66e Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Qt CMake Build Bot
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-251-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad5169b8d1b2a00105df7a4ac2fc0fb6e3537832 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Add QtConnectivitySimon Hausmann2019-10-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the cmake port landed Change-Id: I5218a23fffd8de736ffcf5e039d369aec0827f42 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-241-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ice21b858ec75f6319bee745c47790293e0f3d4d1 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-2311-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I083e08e3c24c1d29d7fedc69490187765a651b12 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Work around cmake issue breaking C++ feature detection on AndroidSimon Hausmann2019-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://gitlab.kitware.com/cmake/cmake/issues/19515, the version of CMake we're currently using in the CI has an issue detecting clang as GNU compatible C++ frontend and thus fails to convert the values in the CMAKE_C/CXX_STANDARD variables to compiler flags correctly. Work around this for now as suggested in the upstream ticket. We can remove this when upgrading to a newer cmake version. Change-Id: I0ea37503c086ff86e05c50b812474522a7737b20 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | platform_configs: add Android arm64 build on RHEL 7.6 hostLiang Qi2019-10-113-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * install vcpkg and for android * a remaining issue in vcpkg: https://github.com/microsoft/vcpkg/issues/8506 Task-number: QTBUG-78945 Change-Id: I484612e2157bf1c1142934cc4f27729e8be37b89 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
| * | | provisioning: update python to 3.7 on macosLiang Qi2019-10-111-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-3271 Change-Id: Ic1645a8b5bc94b0ce6ff58352891af0beabd7649 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | | platform_configs: add a RHEL 7.6 buildLiang Qi2019-10-105-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A preparing for having android build later. * install gcc 7.x * install git 2.x * install a few other dependencies Change-Id: I18f05bdfb78c92b7f05f67609613b5271b400f91 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
| * | | Add qtserialbus to qt5Liang Qi2019-10-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie3ad2a734b1f7ba341a93ff7f3cd96fee56c62c6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Qt CMake Build Bot
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-092-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b900f788ada06c5aa163464b467d41bdc4f9a4e Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-081-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I243f87e1f922a604ac473a22c38a2fcb97bed583 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-081-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia7dadd5ba374c17a9de0a0a0fe5cf71349b2dcf6 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-081-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a4c4dbd484521019d7c31b524110e24402ac96c Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-061-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib9ca071946f1fa578543802707388cf67f1a842b Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id1a1a1a7ab7f8280221fa824ddb775691444c3d8 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I402e989617238940b5c11b4eac1b76f37e89536f Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Provisioning: install libsdl2 on ubuntuLiang Qi2019-10-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3c547c1e44ebc734fd9908db2828440bc13f55f5 Reviewed-by: Qt CMake Build Bot Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Add qtgamepad and qtscxml to qt5Liang Qi2019-10-023-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7267704b048aae8cdd634d47c7ae4040272298ea Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifcd9682f77549feada64323c6b7ee668962cbf2c Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on 'wip/cmake' in qt/qt5Qt Submodule Update Bot2019-10-013-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaf43abe04e52a56cb5a3d1f7d62868c5b5f009d1 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 02:34:29 +0000