aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on 'dev' in qt5Liang Qi2019-06-1826-0/+0
| | | | | | | | | Skip qtbase in this round. Change-Id: Idd621fa568f01f4e4481da61a4e2fb8fe1bdcaba Reviewed-by: Liang Qi <liang.qi@qt.io>
* Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)"Ryan Chu2019-05-312-0/+91
| | | | | | | | | | | | | | This reverts commit 577d01e9dfaa9e69608097c550bd1877b5a9b735. Reason for revert: force vmx instructions to Coin level B virtual machine Change-Id: I54a97fb6dc96315768c8047d487f1ed354ab4aac Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update submodules on 'dev' in qt5Liang Qi2019-05-2815-0/+0
| | | | | | | | Skip qtbase in this round. Change-Id: Id1f988ef49bc35a1d230480af14fc90d4efa86b8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Liang Qi2019-05-267-0/+0
| | | | | | | | Skip qtbase in this round. Change-Id: Icc5ee34380c08b8365128c4f2e18240c6d50a90c Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Liang Qi2019-05-2214-0/+0
| | | | | | | | | Skip qtbase in this round. Change-Id: I3434ffc21f21f953f0538e86e0d554ae5e82b331 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix qtdeclarative boot2qt CI configAllan Sandfeld Jensen2019-05-161-1/+1
| | | | | | | | | | | DISTRO_OPTS was missing quotes. The same thing is also done in 3e6a04c09d8457d64b6dd3d6d95b9d3adb8b3413. Change-Id: Ibb237b791fedea4edde2ca0ef152553502462129 Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> (cherry picked from commit 04fa1bf4ef48599973eceef5c3008ce7ca72a25b) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Bring qt3d backLiang Qi2019-05-132-1/+1
| | | | | | Task-number: QTBUG-75384 Change-Id: Ia7cf50e3567bf01cce9dcc167253d76cdd963d4d Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-05-1310-0/+0
| | | | | Change-Id: I370770bdc8179075f4e5e01e54a29591fd7caa16 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-05-1210-99/+98
|\ | | | | | | Change-Id: I3eb42ce8a43418919c9bb8d0ac4d3714aea94fac
| * Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-05-123-0/+0
| | | | | | | | | | Change-Id: I0e6e46b247198ce68668222e555e3ebf256729bc Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Merge remote-tracking branch 'origin/5.13.0' into 5.13Liang Qi2019-05-121-1/+0
| |\ | | | | | | | | | Change-Id: Ib80ac156ec8ce5690d5ec784c671bd706afe0b4e
| | * Remove redundant windows configurationAapo Keskimolo2019-05-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The windows configuration was added by commit 8cdf60fe6492490561cd6798901b201903ff6ab2 which was unintended and caused breakages due to wrong library paths. Regression was introduced by 65d4cea3ac12a5d585da7ee1ba2933a3c23051b8 which allowed sharing storage paths with builds with different configure arguments. Change-Id: I18d12c4ff86a5bb28484c7b39ca38ff4f6f590d8 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-05-099-0/+0
| | | | | | | | | | | | | | | Change-Id: Ieb925882ea0c8b536bde7f9a1d63aecdf6213632 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Merge remote-tracking branch 'origin/5.13.0' into 5.13Liang Qi2019-05-0910-99/+99
| |\| | | | | | | | | | Change-Id: Ibab4a9d55ce371259f52edb1819a397c1f2d7d9e
| | * Split features list between Coin and qtTony Sarajärvi2019-05-0810-99/+99
| | | | | | | | | | | | | | | | | | | | | | | | Start using configure args as configure string instead of flags. Task-number: QTQAINFRA-2744 Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * Update submodules on '5.13.0' in qt5Qt Submodule Update Bot2019-05-0821-0/+0
| | | | | | | | | | | | | | | Change-Id: I6e14f7f3fedc1ce69e3cedaf8a5b2251d12fae45 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Merge remote-tracking branch 'origin/5.13' into 5.13.0Liang Qi2019-05-0727-11/+85
| | |\ | | |/ | |/| | | | Change-Id: If2321aae395ea99c0fb4cf4ef7b3c5a580d3357e
| | * Update submodules on '5.13.0' in qt5Qt Submodule Update Bot2019-05-0340-0/+0
| | | | | | | | | | | | | | | Change-Id: I637151d097b4f311f86004c2eb26f8a1d8b80ef0 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Adjust submodule branchesKari Oikarinen2019-04-291-40/+40
| | | | | | | | | | | | Change-Id: I8efc4803c92a42e67add0646be00c0d6571fb9e2
* | | Update submodules on 'dev' in qt5Liang Qi2019-05-095-0/+0
| | | | | | | | | | | | | | | Change-Id: I085f25a148ddc404f399e79924968acfd6b7de07 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-05-0929-11/+87
|\| | | | | | | | | | | Change-Id: Ie76cb93e16a98f3b2aae0e6785ccca539e5c5f2e
| * | Replace RHEL 7.4 with 7.6 in the CITony Sarajärvi2019-05-0725-11/+11
| | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-2942 Change-Id: I4186a2961ce81eed7a7fd8994c4a10f35b8fad1c Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | 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 'dev' in qt5Liang Qi2019-05-0941-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporarily ignore qt3d until it got fixed correctly. Task-number: QTBUG-75384 Change-Id: Ib9aec0681b9ca1660f47216e0057600ba4736ce8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 08:45:48 +0000