aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-05-0610-0/+0
| | | | | Change-Id: Ib948b49eccead6649f228a3d7acc83a2f6522660 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-05-041-0/+3
|\ | | | | | | Change-Id: Ia93633ae4ef9677ede751467a70e8f91799829a2
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-3010-0/+0
| | | | | | | | | | Change-Id: If055179b9dfbc4af842c4972cabb79c2966d57d8 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Update submodules on '5.12' in qt5Liang Qi2019-04-268-0/+0
| | | | | | | | | | Change-Id: I69ecf3e1a1f7b5dbdc6e86478475f9563854dac6 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Merge "Merge remote-tracking branch 'origin/5.12.3' into 5.12" into ↵Liang Qi2019-04-260-0/+0
| |\ | | | | | | | | | refs/staging/5.12
| | * Merge remote-tracking branch 'origin/5.12.3' into 5.12Liang Qi2019-04-250-0/+0
| | |\ | | | | | | | | | | | | Change-Id: Ib5cb484726a93f7b317e1dd8e74b446e6673cdbd
| | | * Update submodules on '5.12.3' in qt5v5.12.3wip/qt3dstudio/runtime2wip/qt3d-runtime/masterQt Submodule Update Bot2019-04-1114-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I173c80b1d080350d41108aac01b8d66de0dcfb56 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Update submodules on '5.12.3' in qt5Qt Submodule Update Bot2019-04-0535-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I216b93959076bc9402c715599398dea770cacde2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Update submodules on '5.12.3' in qt5Qt Submodule Update Bot2019-03-307-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I34e1bd8f276b6e9eb2a1f658f2447fdd01fd4d09 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * Adjust submodule branchesKari Oikarinen2019-03-251-40/+40
| | | | | | | | | | | | | | | | Change-Id: I28500be5d253a4d047cef1409659c275c314d5b0
| * | | Provisioning: Install python36-devel to rhel 7.4Simo Fält2019-04-251-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | The rhel Python3 system package is missing development libs. Fixes: PYSIDE-996 Change-Id: I3863c85ad04021dd0f0d4af4bae5917a6785a7e1 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Provisioning: Install Vulkan to Rhel 7.4Heikki Halmet2019-04-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Enables Vulkan support at compile time Task-number: QTBUG-72763 Change-Id: If97adb030d50a147c9714afe3ef360291904b58a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-247-0/+0
| | | | | | | | | | | | | | | Change-Id: I2c02e38847615cace282fa261ac5ac526eb6ece2 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-2337-0/+0
| | | | | | | | | | | | | | | Change-Id: I2fa664d7b94bf511d4321e0698aba679ccb38ad0 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Provisioning: Remove MSVC 2015 update 3 patch from provisioningHeikki Halmet2019-04-181-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC 2015 update 3 patch seems to be already pre-provisioned with MSVC 2015 update installation Task-number: QTQAINFRA-2899 Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit b3e35cbac501c749cd17a48c8fc85ef6f8acbba7) Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-164-0/+0
| | | | | | | | | | | | | | | Change-Id: I01acdb8d1dc3137abb193a9ccf1dba20d6953bcb Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-146-0/+0
| | | | | | | | | | | | | | | Change-Id: Ie4120272ceba142d35265f2fbde316e2af8b30a9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-05-032-0/+0
| | | | | | | | | | | | | | | Change-Id: I99a2129b1f73fc1dd801b406b9741cdfea37429e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Provisioning: install msys2Juha Karjalainen2019-05-032-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | Windows need msys2 perl for configuring openssl 1.1.1 for android. Task-number: QTQAINFRA-2327 Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-05-0240-0/+0
| | | | | | | | | | | | | | | Change-Id: I4f9b2ff00e79cf16a9effd6bdffa679a7f25b50b Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOMEHeikki Halmet2019-04-232-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Without this binaries will be hardcoded to look in e.g /opt/android/android-ndk-r19b which means that RTA tests will fail Task-number: QTBUG-74952 Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Update submodules on '5.13' in qt5v5.13.0-beta3Qt Submodule Update Bot2019-04-169-0/+0
| | | | | | | | | | | | | | | Change-Id: I4b003f32744fbf25b6439b555a01ee130d50467e Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 00:41:40 +0000