aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Upgrade CMake to 3.15.0-rc1Jean-Michaël Celerier2019-06-051-3/+3
| | | | | Change-Id: I374631637a6521621dfa702aa2390998ef124d24 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Provisioning: Add ninja to the list of installed packagesLiang Qi2019-05-241-0/+5
| | | | | Change-Id: I018e7812fc95c1db841720294a700a391246251d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Move some configure arguments to qtbase instructionsJędrzej Nowacki2019-05-221-3/+3
| | | | | | | | These arguments are specific to the build and changes to them are _not_ affecting configuration. Change-Id: I701b7d83511c5f80b88c5aab09eae3ecb6df74a1 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Use yaml configuration file for cmake supportLiang Qi2019-05-208-45/+13
| | | | | | | | It is needed by new coin to support cmake build as only there configuration arguments are separated from features. Change-Id: I960ec693f80803fd86de472efc953a38358ae14e Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Update submodules on 'wip/cmake' in qt5Liang Qi2019-05-081-0/+0
| | | | | | Change-Id: I437150950324ad3734ad895b6cbc4ad7bf6139a1 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Provisioning: install vcpkg and some packages on Windows 10Liang Qi2019-05-032-0/+67
| | | | | Change-Id: Ib8ba5b30ebcfb5e66ce5de65c9287807943d7166 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Provisioning: install latest cmake - 3.14.1 on WindowsLiang Qi2019-05-031-4/+4
| | | | | Change-Id: I461589be02c26e048d5975d59600376022d728fd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Provisioning: Add Windows 10+MSVC2017 to test cmake buildLiang Qi2019-05-031-0/+1
| | | | | Change-Id: I7acd16f12ed0e5d0fb7a9961c9099b9e4f1a2401 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Provisioning: Add freetype to the list of installed packages on macOSLiang Qi2019-05-031-0/+5
| | | | | Change-Id: Ic2df763fc027e3a588723a37a70354d3becc29a6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Provisioning: Add pcre2 to the list of installed packagesLiang Qi2019-05-031-0/+5
| | | | | | | This external dependency is now required by QtCore on macOS. Change-Id: I4eef98e8e54f00861c1e9469dfbac61979d652e8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Provisioning: build cmake from source on macOS 10.13Liang Qi2019-05-032-6/+8
| | | | | Change-Id: Ifada0cf62d1e75e8cab3e3bbe6250718747d0703 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add macOS 10.13 to test cmake buildLiang Qi2019-05-031-0/+1
| | | | | Change-Id: I676db571d3a14f2abd823d41905b95a070c66f59 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update submodules on 'wip/cmake' in qt5Liang Qi2019-05-031-0/+0
| | | | | | | Only needed for qtbase though. Change-Id: Ib3fdd44c2804139795fc1efc192e05d227f8b8dc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeLiang Qi2019-05-03105-410/+611
|\ | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/default.txt coin/platform_configs/qt5.txt coin/platform_configs/qtbase.txt Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
| * Provisioning: disable docker test servers on Windows 10 (x86_64)Liang Qi2019-04-162-91/+0
| | | | | | | | | | | | | | This reverts commit 177df80f09f3a84af7d86390ae7160a64fad8b4c partially. Change-Id: I6c091ad48397ad221090274144ac88dfa47c0e0f Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
| * Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-04-1486-232/+302
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I6f34dcaedd77228215e1cfa92cd12b6334a41834
| | * Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-04-131-0/+0
| | | | | | | | | | | | | | | Change-Id: Icdc234fca978fd0f510462390b7de537485c7d25 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-04-137-0/+0
| | | | | | | | | | | | | | | Change-Id: I6052700191cd9ebd56e1f97fd0f7d52bdb5ef62e Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-04-1367-68/+205
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/qt3d-runtime.txt coin/platform_configs/qt5.txt coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e
| | | * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-127-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I79cbed7287f7b160624b77b08df04d8fd33c7907 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | | * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-119-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibe1d38a062889777ab9d8dc5ec4d2fb46e8b4cb6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | | * Provisioning: Echo Emscripten version information to versions.txtHeikki Halmet2019-04-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0ad9b2299805534d1f635fd89ac74d4feb8ce5c4 Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | | * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-106-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If36b8642907dc68d9d53cfe01bfa91a9d25f3fff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | | * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-0913-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I0e3a8b053ca414cff6e066f24514727b25e444bf Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * Provisioning: Install i686 mingw on Windows 10 X64Ivan Donchevskii2019-04-082-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required to compile 32-bit binaries. Fixes: QTQAINFRA-2896 Change-Id: I91a43ecf6e2c97886429c34c79591999b908879f Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | | * Fix shellcheck complaints from provisioning scriptsTony Sarajärvi2019-04-0160-50/+93
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d1ee4241d7e99269e8c717ceb2aecde3194c51a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | | * Fix soft links and file modes of a few macOS provisioning scriptsTony Sarajärvi2019-04-014-15/+46
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d4d09424aa2ce0b75d840a2c26cbfed99740d0c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | | * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-2810-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I2df7f448e6f121039e343b3dd87d7fbbcbef25fd Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-2711-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I7e7a49b60f4082d177c59dd3ccdd752fc4e3c5ca Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-237-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I944abf1de570b68229ba2284e93e879aadc21b2d Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * Remove 32bit MSVC 2015 from the CITony Sarajärvi2019-03-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-2251 Change-Id: I4006c7390759e2eb357309de36eb23af007a576e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | | * Provisioning: Remove certificate printing to logJuha Karjalainen2019-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | macOS openssl provisioning printed certificates to log. This patch prevent printing certificates to log by redirecting it to /dev/null Task-number: QTQAINFRA-2841 Change-Id: I9ec120212a1f068fa040a302cb50e775857cbb74 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
| | | * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-224-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Idba1b3637a56b7bf822c6a0bff29dd91dca735b7 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-2140-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I5cd2a0098c21f4d4691261fd5c2c1f535f119a77 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * Merge remote-tracking branch 'origin/5.12.2' into 5.12Liang Qi2019-03-213-3/+24
| | | |\ | | | | | | | | | | | | | | | Change-Id: I8795e84dd750cbb2b55a03c861b911f57a1e2626
| | | | * Update submodules on '5.12.2' in qt5v5.12.2wip/qt3dstudio/2.3wip/qt3d-runtime/2.3Qt Submodule Update Bot2019-03-082-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9fc68dfd357dd32546248dee88558744502cb24c Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| | | | * Update submodules on '5.12.2' in qt5Qt Submodule Update Bot2019-02-2812-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3448762f4f01e6fd334927713a61c8d1d6881ab6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | | * Remove qt3d-runtime.txt symbolic link from platform configurationsAntti Kokko2019-02-281-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caused recursion in CI platform configuration parsing algorithm. Add qt3d-runtime.txt back as regular file. Task-number: QTQAINFRA-2804 Change-Id: I11c42a70dcd2157501d4b1f0f67fc7a77a575d31 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | | * Update submodules on '5.12.2' in qt5Qt Submodule Update Bot2019-02-273-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifc604747b5d94f44948a710e2f9b1c0a5318eaa5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | | * Update submodules on '5.12.2' in qt5Qt Submodule Update Bot2019-02-2313-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id1d8765c3a400a7e12725ccf7fcff5aef49c47c0 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | | * Update submodules on '5.12.2' in qt5Qt Submodule Update Bot2019-02-2126-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I131875e52b21ab1c354955cf82427470094da8ea Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | | * Fix: Set correct path to environmental variableJuha Karjalainen2019-02-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Env variable BREAKPAD_SOURCE_DIR had /src at end which was not needed. Change-Id: I4d126c3b7c3b2da03dc2a0ba075b0d4ddad92eeb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | | | * Update submodules on '5.12.2' in qt5Qt Submodule Update Bot2019-02-164-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea1284a0920bbae7ebefda199db7564f3d874edc Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | | * Adjust submodule branchesKari Oikarinen2019-02-131-40/+40
| | | | | | | | | | | | | | | | | | | | Change-Id: I309db20815d3b383155e6549b649607e956b8d89
| | | * | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-2041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If57974194302222651f94a7e7b99cc4e34c3b3a1 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * | Provisioning: add dependency walker to win10 x86Johanna Äijälä2019-03-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed by RTA. Change-Id: I51889477dd6e6f4bdff509ab8f6c1b8307842ebd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | | * | Provisioning: Make gnuwin32 available for windows machinesHeikki Halmet2019-03-177-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script will install gnuwin32 to the windows machines so it can be removed from qt5 Task-number: QTBUG-73422 Change-Id: I40b7963efcf047525626fe6f1e3ba50b54d68199 Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-04-1311-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifb78bd23df6129ccb226b7e0862ebe5620353b3a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-04-124-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64ac0b2aeaaed0908aaebff7c45b486b8159e893 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | | Provisioning: update python 2.7.14 to 2.7.16Juha Karjalainen2019-04-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python 2.7.14 used tlsv1 which is no longer accepted by github thus needing update to newer version. Task-number: QTQAINFRA-2900 Change-Id: I4e0790854b7c0732e4064ad355d953eb7b71a2b9 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 12:17:54 +0000