aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-0432-0/+918
|\ | | | | | | Change-Id: Ie49f7e5ff9ca02522c6611922b47870aba2c152e
| * Add macOS 10.14 to the CITony Sarajärvi2019-08-0332-0/+918
| | | | | | | | | | | | | | Task-number: QTQAINFRA-2938 Change-Id: Id25c6c3203a07985c9ef1cc914c4398ac7db615c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Liang Qi2019-08-0397-2108/+3558
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-0397-2108/+3558
|/| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules ignore QtWebEngine on QEMU temporarily. coin/platform_configs/default.yaml no-gui build was removed temporarily. coin/platform_configs/qt5.yaml coin/platform_configs/qtbase.yaml coin/platform_configs/qtconnectivity.yaml coin/platform_configs/qtsaferenderer.yaml Task-number: QTQAINFRA-2576 Task-number: QTBUG-77304 Task-number: QTBUG-77305 Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io> Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
| * Provisioning: update conan_manifests for libxslt packagesKonstantin Tokarev2019-08-017-48/+40
| | | | | | | | | | | | | | | | Package recipe was improved, as a result packages were rebuilt and checksums need update. Change-Id: I33bd30b44cbe48b3550cb42eeb995ef8588fcce7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update platform_configs for QtWebKitKonstantin Tokarev2019-08-011-7/+1
| | | | | | | | | | | | | | | | | | * Remove redundant MSVC2017 configuration * Synchronize Mingw73 configuration with qt5.txt Change-Id: I05557ecbf57206fe56ff113f893c37a65f503bf0 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Remove 'Packaging' feature from WinRT_10 x86Jani Heikkinen2019-08-011-1/+1
| | | | | | | | | | | | | | | | We don't deliver binaries for that target anymore -> do not export that either Change-Id: Iccf408adeaed071294e10774a5a0c21ec8bd8014 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-317-0/+0
| | | | | | | | | | Change-Id: Ie88f0f640e5cd5ad3e3bb159e0b2c248fddc4d40 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-284-0/+0
| | | | | | | | | | Change-Id: I2a96915081171e92e91e5a595e87cd2e0b991a51 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Provisioning: update Conan and Conan packagesKonstantin Tokarev2019-07-2661-1941/+2925
| | | | | | | | | | | | | | | | | | | | | | | | [*] Update Conan to 1.17.0, adjust to change in command line arguments [*] Update Conan packages to up-to-date versions, add libjpeg-turbo and packages for 64-bit MinGW [*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after Python 3 and MinGW [*] Add license header to conan.ps1 Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * Provisioning: Add CompilerException and CompilerThreads settings for ConanKonstantin Tokarev2019-07-261-3/+13
| | | | | | | | | | Change-Id: I3a52101056bce4d3d4ac9124dbfd566adf47cf80 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * Provisioning: rename 03-conan.ps1 to conan.ps1 to follow naming conventionKonstantin Tokarev2019-07-264-3/+3
| | | | | | | | | | Change-Id: If24541709d4675498bc4af296e05ce3c62d5045a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * Conan: Suppress output of New-ItemKonstantin Tokarev2019-07-261-1/+1
| | | | | | | | | | Change-Id: I3d62fffa08d38a383187726e08743512236bb859 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-262-0/+0
| | | | | | | | | | Change-Id: I0b682ebd4643a85f04cb2192efb97e8c5230759a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Provisioning: install-msys2.ps1 must run its commands synchronouslyKonstantin Tokarev2019-07-261-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | [*] Using bash instead of msys2_shell.cmd allows Start-Process to actually wait for the end of command execution. [*] cpan requires "yes" to be typed by user when it's run first time, otherwise it hangs indefinitely waiting for input. [*] Stop gpg-agent and dirmngr started in the background to prevent CI session from hanging. Change-Id: I4d4c1f36d215cb7578d1e7059217e34375de96c6 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * Use msiexec to install Strawberry Perl from msi packageKonstantin Tokarev2019-07-261-1/+1
| | | | | | | | | | | | | | | | Currently provisioning fails with following error: "This command cannot be run due to the error: %1 is not a valid Win32 application." Change-Id: I59290d394f231c37af10f27d07dbb9f5d2d2470a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * Provisioning: Run-Executable should print stdout and stderr to logKonstantin Tokarev2019-07-261-2/+34
| | | | | | | | | | | | Task-number: QTQAINFRA-3085 Change-Id: I5343753f75157a2a894bb3ac50d416ab044d86fb Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * Provisioning: don't re-run Conan 5 times if there is no errorKonstantin Tokarev2019-07-261-1/+1
| | | | | | | | | | | | Change-Id: Ia348ebbc4fc3a2503cc426c011e68b7a410c4a08 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-257-0/+0
| | | | | | | | | | Change-Id: Ife94a7c6264fbb4525ba2cd0370bdf1ba454b7c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-2310-0/+0
| | | | | | | | | | Change-Id: I09887cc4b1e103b9341f096c4c9164f4a96bd431 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-1411-0/+0
| | | | | | | | | | Change-Id: Ib0b559d638d7ae6df4129b97f433b168af757443 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-071-0/+0
| | | | | | | | | | Change-Id: Ieb1b3ec8ae527fe13bd1980045f721511ef579a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-065-0/+0
| | | | | | | | | | Change-Id: I4c21b50f87410c4c253f510604e3ec80d6b6f929 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-053-0/+0
| | | | | | | | | | Change-Id: Ief716d10e9e1efcb655f96cc297a3a22ff67839b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-0440-0/+0
| | | | | | | | | | Change-Id: I039e035c56bd14a86eb1b309d0372c90b5d737cf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Fix extra file and missing library in platform configurationsToni Saario2019-07-022-31/+1
| | | | | | | | | | | | | | | | | | Missing libraries in no-gui platform. Default.txt was supposed to be removed by 439a1eb2207417a6d2d0f14766e3e627035a9a7f Change-Id: I91c7802634f69f9e5475921b3610185b386b1b1f Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
| * Change configuration files into yaml formatToni Saario2019-07-0121-72/+370
| | | | | | | | | | | | Change-Id: I252908e9eae3a254f32a286608734b5728cd60b8 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-06-285-0/+0
| | | | | | | | | | Change-Id: I1bdf6510557ffbc7b3bfd292d18a0f27cb0cee23 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Add correct openSSL arguments to no-gui buildsTony Sarajärvi2019-06-281-1/+1
| | | | | | | | | | Change-Id: Ida58ff76bf154dbaf4ffb4cb18005874e10a9c46 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * Provisioning: Upgrade PyYAML because of possible security vulnerabilityHeikki Halmet2019-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Known high severity security vulnerability in pyyaml v< 4.2b1 Task-number: QTQAINFRA-2888 Change-Id: I6522fc66ca7c4323cc6248ec2cb31c62201f8e84 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Add a no-opengl build on Ubuntu 18.04Tony Sarajärvi2019-06-261-0/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-2577 Change-Id: I815adf0f85f688d9d584b95122d1944cb4b660c1 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * Provisioning: Fix cleanup when building GCC from sourcesTony Sarajärvi2019-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We need sudo rights to delete the temporary folder where sources for GCC are extracted. Change-Id: Ic0642e44eabfc3449f7ce5903a63bd38924f7dca Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-06-263-0/+0
| | | | | | | | | | | | | | | | | | Change-Id: I5476ca1d214e18ba91b313f9a742d31fc9e04fe7 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-06-253-0/+0
| | | | | | | | | | | | | | Change-Id: I961e20f994ffcbc97b822f53069cc3bd5a399345 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * platform_configs: Add missing "Configure arguments" to qtconnectivity.txtOliver Wolff2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | Without the tag configure arguments will not be parsed by Coin so that wrong configurations will be used. Change-Id: I02f84cde07e9e4cf878add89ba9ba43dacf9d567 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Liang Qi2019-06-2530-159/+531
| |\
| | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Liang Qi2019-06-2530-159/+531
| |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io> Change-Id: I1381c4b80a64859cb42d6cb5205ef549de40dde6
| | * ogl-runtime: instead of linking to qt5.txt use the actual configurationv5.12.4wip/qt3dstudio/2.4wip/qt3d-runtime/2.4wip/ogl-runtime/2.4Antti Kokko2019-06-121-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b1d467f2c67026fc8039b7346ea8ca02250ba1c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Update submodules on '5.12.4' in qt5Qt Submodule Update Bot2019-06-133-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2b8b3fc60e242872f1cfb850c6219a72b39d471a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Disable MySQL from packaging buildsHeikki Halmet2019-06-132-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't link against 3rd party GPL libraries Task-number: QTBUG-76081 Change-Id: Ia78c58b14349078259488eafb592c2f70dbf7241 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit a05bd71ede9e2c67a66fd2d28fab8e9e9386e51c) Change-Id: I97d1d06b266490080325126e2dd715436a91b01a Reviewed-by: Simo Fält <simo.falt@qt.io>
| | * Fix openssl 1.1 library configurationsHeikki Halmet2019-06-132-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| | * Update submodules on '5.12.4' in qt5Qt Submodule Update Bot2019-06-112-0/+0
| | | | | | | | | | | | | | | Change-Id: Id04721e958f15621a0a5b35aa0d44dc2d7238549 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Use link to qt5.txt instead of copy in qt3d-runtime.txtJani Heikkinen2019-06-091-22/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If61fe724af869fb35637321311bfb052d3009956 Reviewed-by: Antti Kokko <antti.kokko@qt.io> (cherry picked from commit c5e443374aaa7d7cdfe90a69bbe3dc33604b5d32) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Add platform configuration file for ogl-runtime repositoryAntti Kokko2019-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use configuration from qt5.txt. Change-Id: Ic788b70545169ee1fce5a97f016882cacd4a7908 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Update submodules on '5.12.4' in qt5Qt Submodule Update Bot2019-06-1041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0a4f9340c23cc8a7b502870e690d1fccb54425f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Install prebuilded OpenSSL 1.1.1b for Windows 7Heikki Halmet2019-06-101-49/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 247b429c3c435a62df3d6f94c96c7cd1b7c22299)
| | * Provision sed for windows 10Juha Karjalainen2019-06-103-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sed is needed by webassembly build. Cannot use sed from msys as having msys bin folder in path breaks webassembly build. Task-number: QTQAINFRA-2835 Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 230a73409a2fe58e7de0674107a2d870be0bf03d) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Provisioning: install msys2Juha Karjalainen2019-06-102-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> (cherry picked from commit 6465c421225574dc1c5d9f23293c37e784fd1b02) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Provisioning: Change openssl version to 1.1.1bJuha Karjalainen2019-06-1021-126/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use newest LTS version of openssl as support for 1.0.2 series will end at end of 2019. For windows 7 x86 openssl 1.0.2 will be used until all need fixed are made to submodule tests Task-number: QTQAINFRA-2327 Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 3e838f2a34d0c1538535bd184aa12681497c8a38)
| | * Fix platform configuration filesTony Sarajärvi2019-06-103-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typos, duplicate entries and one missing rebase ended up in the initial cherry-pick from 5.13 Change-Id: Ibf0fdb8cbc62f8223a0ede89ad4c013ceb7d145e Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit d77fdecc11054c6fb0c34824935fcbfcdf644734) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 05:13:54 +0000