aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-284-0/+0
| | | | | Change-Id: Id084a6f6a3ce4109beb1f36088afe2914ffa7735 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Changed slash direction in CI_CONAN_BUILDINFO_DIRKonstantin Tokarev2016-09-261-1/+1
| | | | | Change-Id: I13bea231301f12a3992abc11119fc34543e75ab2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-251-0/+0
| | | | | Change-Id: I10f0169fa184c4f0c297af4b8f8795a711d88e58 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-2510-0/+0
| | | | | Change-Id: I2a5733b235e381990aa51c87af3d69fa2582541f Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-237-0/+0
| | | | | Change-Id: I0471e3be4be3b6109fe2afab79ba26915eede933 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.7' in qt5Liang Qi2016-09-2029-0/+0
| | | | | Change-Id: Ibdccfa62d894d5e2b3a72bf09d72b4c9c7ff1981 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning WindowsKonstantin Tokarev2016-09-183-4/+4
| | | | | Change-Id: I841783122edf82739826cc0a7672d8c809870e97 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Do not use qmake and cmake generator automatically for each conanfileKonstantin Tokarev2016-09-173-1/+3
| | | | | | | | | Keep conanfiles self-contained. "txt" generator is not going to be used by coin internally, drop it. Task-number: QTQAINFRA-998 Change-Id: I80ffb7342e07d8ef883bed6de77ac9646479f145 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Added cmake_installer, imports and explicit library types to conanfilesKonstantin Tokarev2016-09-172-0/+30
| | | | | | Task-number: QTQAINFRA-997 Change-Id: I70b51a47c12928944d9f48be13332fce12296af1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Changed BuildinfoDir of conan to use Coin-compatible compiler nameKonstantin Tokarev2016-09-172-2/+2
| | | | | | Task-number: QTQAINFRA-998 Change-Id: Ica31bf88055cb46eb9b6a0438ba5df461b6c8e5f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Install conan dependencies if there is conanfile.txt for moduleKonstantin Tokarev2016-09-143-0/+40
| | | | | Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Added conanfiles for qtwebkitKonstantin Tokarev2016-09-142-0/+8
| | | | | | Task-number: QTQAINFRA-997 Change-Id: I7aadf3549affeeeb3130d8fdb9ff15242a36aeb9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Install Conan on Win10Konstantin Tokarev2016-09-143-0/+9
| | | | | | | | QtWebKit will use Conan to install 3rd party dependencies like ICU. Task-number: QTQAINFRA-997 Change-Id: I4b9bfeb86b28abfdef52afcf249428c3ec41f32a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update Ruby on Win10Konstantin Tokarev2016-09-144-0/+29
| | | | | | | | QtWebKit requires newer Ruby than version installed on Windows 10 builders. Task-number: QTQAINFRA-997 Change-Id: Id4f917a824daaab4aeb1445a3a16906663208b6d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-121-0/+101
|\ | | | | | | | | | | | | Conflicts: coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh Change-Id: Ib972234bb644353db6920b2dcbe1fd4775ef1779
| * Android sdk and ndk to provisioning for qt5.6Heikki Halmet2016-09-121-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | Install latest Android sdk and ndk. It also runs update for SDK API level 18, latest SDK- and platform- tools and build-tools version 23.0.3. Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. Change-Id: Iddc353674a65e0af7a9036d9296b9c2933fa114f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-069-0/+0
| | | | | | | | | | | | Change-Id: I1f0e77afca353b07420ed8da001cfbbaaa738dce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-042-0/+0
| | | | | | | | | | Change-Id: I34bab96a9ec73aa07e1295250aa85528f306a679 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-028-0/+0
| | | | | | | | | | Change-Id: I565078e5d2d1d8b6a9111d3f063eaebafe008c6f Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-08-3013-0/+0
| | | | | | | | | | Change-Id: I45ed20f8f12335ac2d7aa315329a25c8fbac94fa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-08-2213-0/+0
| | | | | | | | | | Change-Id: I1104beac8bafb324731879efdb752a1cebbb9512 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-08-1610-0/+0
| | | | | | | | | | Change-Id: I3fbdb4edc4d37a8b25fdaff52853d672c951891d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-08-1312-0/+0
| | | | | | | | | | Change-Id: I4821c386e318139e13ad228983c43c1b1d978494 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-08-1012-0/+0
| | | | | | | | | | Change-Id: I166e0f9a092f7e293d50d7efb12df54bcee5ec13 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-077-0/+0
| | | | | | | | | | Change-Id: Ic053fa3b81c674e4a63419bdab848e362b2a93a6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-0313-0/+0
| | | | | | | | | | Change-Id: I8309b4fd697efb7b539c84d0c351b25c230a4950 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-08-2614-0/+0
| | | | | | | | | | Change-Id: I726579f7e3e25774dc882c1c9d4780ccf23deaed Reviewed-by: Liang Qi <liang.qi@qt.io>
* | fix branches of qtpim and qtsystemsOswald Buddenhagen2016-08-181-2/+2
| | | | | | | | | | | | | | | | these repos were definitely _not_ branched for 5.7. Change-Id: Ib31d4e07f2651cfba0a7d31a9db1f1a812061313 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-08-188-0/+0
| | | | | | | | | | Change-Id: I8b849ebf5685a65206d1c60d1c3f7b85e3e6716d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-08-1111-0/+0
| | | | | | | | | | Change-Id: I5494d36a2b93a85acbc5825f5bd73d032a4098a9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-08-071-0/+0
| | | | | | | | | | Change-Id: I0f7724142af344e35897035016b03ce046c8164e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-08-061-0/+0
| | | | | | | | | | Change-Id: I59475dd0549f9c4c83ad830a76b3b5225aa90eda Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-08-064-0/+0
| | | | | | | | | | Change-Id: I92e5272d0d0662bfed36e2fa51d25b729e89a172 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-052-0/+6
|\| | | | | | | Change-Id: I1a08537bcd4748ebbb3e5a670e3a099779f33945
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-08-0413-0/+0
| | | | | | | | | | Change-Id: I32152358542e406f773d106abba25ee5609c6469 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Fix Coin provisioning in RHEL 6 regarding sslclientkey valuesTony Sarajärvi2016-08-032-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug in RHELs subscription manager that caused yum not to work by fetching incorrect data into the sslclientkey repository parameter value. This provisioning script fetches new data for the repository and thus fixes yum. Naturally by not having a template where a bad repository exists, this script would be obsolete. Also, as this needs to be run before any other scripts using yum, prefixes were added to the scripts. Change-Id: I5c6ed1d43451d2918f9b6dad22b0106339f36aea Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-07-3025-0/+0
| | | | | | | | | | Change-Id: Ie6bd9ea82d5e67fee7645dccd9b07ceac5755582 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Updated submodulesQt Submodule Update Bot2016-07-045-0/+0
| | | | | | | | | | Change-Id: Ia80e4d39f9772e32952685008380cc348f481c6c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Updated submodulesQt Submodule Update Bot2016-07-047-0/+0
| | | | | | | | | | Change-Id: I5443b0f4d97cfc076e3a642ae78770b38661e983 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Updated submodulesQt Submodule Update Bot2016-07-013-0/+0
| | | | | | | | | | Change-Id: I48fca93fd045323752c79abd2710e9307ea85b3a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Updated submodulesQt Submodule Update Bot2016-06-305-0/+0
| | | | | | | | | | Change-Id: I23f310f80837c73fee1fff2618e1253c6b80b74b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Updated submodules.Qt Submodule Update Bot2016-06-299-0/+0
| | | | | | | | | | Change-Id: I5a2524a408eaf6f808c0e1242583e83bf01b42b0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Updated submodules.Qt Submodule Update Bot2016-06-255-0/+0
| | | | | | | | | | Change-Id: I5a780a47ccfcea17e64eda0ed922ca57079ea0ea Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Updated submodules.Qt Submodule Update Bot2016-06-2313-0/+0
| | | | | | | | | | Change-Id: I67cbc0f3327aeaf3c84e2eb52432a362f0e7c64a Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-08-059-0/+0
| | | | | | | | | | Change-Id: I203ab93ecfa295c0a8051b85855333e5a92030c8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-08-038-0/+0
| | | | | | | | | | Change-Id: I03f7c07e68856947471fe9976ff996b680c9fabf Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-08-0238-0/+0
| | | | | | | | | | Change-Id: I65292231de671b660f232f0ccac7aeb4ae700f59 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Updated submodulesQt Submodule Update Bot2016-07-194-0/+0
| | | | | | | | | | Change-Id: Id18ec0d487df664c69aff8a8fe8a2ceff64ab42d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Updated submodulesQt Submodule Update Bot2016-07-153-0/+0
| | | | | | | | | | Change-Id: I4e1ec0bbeccad560b49b39b4280950684209445d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Updated submodulesQt Submodule Update Bot2016-07-146-0/+0
| | | | | | | | | | Change-Id: If0b6c9e8ddac98085848e44d84ad26e9cc403043 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 12:39:32 +0000