aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Add Android NDK/SDK to provision for macOS 10.10 and 10.11Heikki Halmet2017-01-247-0/+265
| | | | | | | | | | | | | | | | | | Install latest Android sdk and ndk. It also runs update for SDK API level 18 Task-number: QTBUG-58370 Change-Id: I1bf8cb42dd3e753be27fa9fcd2c1ac8ccbdb87c3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on '5.6' in qt5Liang Qi2017-01-223-0/+0
| | | | | | | | | | | | Change-Id: I57bbccaf30143e1ca8b56ca31a229b007111a34f Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * Update submodules on '5.6' in qt5Liang Qi2017-01-172-0/+0
| | | | | | | | | | Change-Id: Ie8aa9fd84a4b85c280831771c261b621238c9bf4 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.6' in qt5Liang Qi2017-01-122-0/+0
| | | | | | | | | | | | Change-Id: I5599c7876c25f21fb286013a2d8cccda5efebe02 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Update submodules on '5.8' in qt5Liang Qi2017-01-2830-0/+0
| | | | | | | | | | Change-Id: If492971dc4c714f7d11e693d13abc64d6bba83e3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-260-0/+0
|\ \ | | | | | | | | | Change-Id: I20aad260fd151fc3261548eead12cb23fa3127b6
| * | Update submodules on '5.8.0' in qt5v5.8.0Qt Submodule Update Bot2017-01-192-0/+0
| | | | | | | | | | | | | | | Change-Id: Ib32e222f05e3af71d9f194683ba57f792343924d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Merge remote-tracking branch 'origin/5.8' into 5.8.0Oswald Buddenhagen2017-01-1819-0/+563
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pulls in the CI build configurations. These files were previously stored in the CI source tree, but they do belong here. They describe the different configurations under which we want to build Qt and its submodules, in terms of underlying virtual machine template, host OS, target OS and CI related features that may also map to Qt configuration features. Task-number: QTQAINFRA-1074 Started-by: Simon Hausmann <simon.hausmann@qt.io> Change-Id: I8ab9b987a28566ad036dcaf8f0663bd633fea439
| * | | Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2017-01-142-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I13f342ad11d00e1d6df9af60290bbd97793b3a6d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2017-01-091-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I32db28a8a7f6068aca3fb6c34c15998b569e3d5e Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
| * | | Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2017-01-078-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If96f0ff600589f565235c471fa3380bbe9848914 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2017-01-038-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I2cc710394ca9910d60bdf6d8e6079968a17f6270 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | Merge remote-tracking branch 'origin/5.8' into 5.8.0Simon Hausmann2017-01-0230-56/+241
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings in the Android OpenSSL fixes to allow the use of newer TLS versions with Qt, the conan manifest updates to allow for provisioning to work as well as a few other fixes from the stable branches. Change-Id: If2e4a1b8a4c8e44cd8d9b8918a3083cbaf1b385c
| * | | | Update submodules on '5.8.0' in qt5v5.8.0-rc1Qt Submodule Update Bot2016-12-201-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I060ef5334c8d096c6167663b5c2dd8d45a5a2aec Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | | Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-191-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id31eaddee9fe5f64def0e4ddf3b81007c7fead16 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * | | | Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2f0a28823f83b2980989b3070a6ee91e1957ee7e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-1617-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic73b70eb3399c4d1a69e76e0a55896ced61423b6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | | Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-114-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9dee754f6b2ea4be834a483012ec8e13fe72c8c8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | | Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-106-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I602ac700f615b32917a16cc368403978869b0c9a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | | Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-099-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I288795ff5b32bb847d17f1ae9828bc1c83102e8b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | | Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-0812-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia2d83e159b8648958cb123045aabd254330287ea Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | | Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-0713-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie42264d273d73c32f2763ed3c9dfa7dcb1ede5d6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | | Update submodules on '5.8' in qt5Liang Qi2017-01-2612-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I51a509a5499af603c7eba23ba66b0ddb1eafa4f8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | Update submodules on '5.8' in qt5Liang Qi2017-01-2411-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If8fe86b5faa11ef6a04a5433e325975e49361965 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | Update submodules on '5.8' in qt5Liang Qi2017-01-229-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I05b0a2ab6493c9435a8a37d129decf0596a8b84d Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | Update submodules on '5.8' in qt5Liang Qi2017-01-1915-0/+0
| |_|/ / |/| | | | | | | | | | | | | | | Change-Id: Ib1144af40af6562020a0f46fb1d31107a5e1e0e3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Update submodules on '5.8' in qt5Liang Qi2017-01-167-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I6c8442fbe66f30e1c822efa0ff83387c25e6ac8f Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Update submodules on '5.8' in qt5Liang Qi2017-01-1412-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibd6924df667113c2a1c9b3a3e8f9c8d29c52c85c Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Merge remote-tracking branch 'origin/5.7' into 5.8Simon Hausmann2017-01-1211-0/+269
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also includes an update of the CI platform configurations to the values that were previously in the CI source tree for builds of the 5.8 branch. This is done within the same change as the merge to preserve atomicity. Task-number: QTQAINFRA-1074 Change-Id: Iac469c44048721530380ab577c6dbf1a6fa28211
| * \ \ \ Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2017-01-1114-0/+540
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also includes an update of the CI platform configurations to the values that were previously in the CI source tree for builds of the 5.7 branch. This is done within the same change as the merge to preserve atomicity. Task-number: QTQAINFRA-1074 Change-Id: Ie7bde30bd64d439cd17ea789102550ab9fb44194
| | * | | Add CI build configurationsSimon Hausmann2017-01-112-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files were previously stored in the CI source tree, but they do belong here. They describe the different configurations under which we want to build Qt and its submodules, in terms of underlying virtual machine template, host OS, target OS and CI related features that may also map to Qt configuration features. Task-number: QTQAINFRA-1074 Change-Id: I7ce48e3b15da757166eeac7531478d3746c8aa7f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| | * | | Provision: Cmake 3.6.2Heikki Halmet2017-01-114-0/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Red Hat 6.6 needs cmake for GammaRay OpenSUSE 42.1 and Ubuntu 14.04 needs cmake for pyside Change-Id: I64b25be70057b86be7bfc96fb07446f7727bbefe Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | | Add provision helper file to install compressed packagesTony Sarajärvi2017-01-111-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a7e1af7c91bd11a0cc6379f8bb7762acf42eae5 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | | Add DownloadURL.sh provisioning helper scriptTony Sarajarvi2017-01-111-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64bef8470555e33772b72847aa76e0e9b4720696 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | | Add provisioning try-catch helper script for bashTony Sarajarvi2017-01-111-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia61e503ed5315546421fdeb2f4b8b1be37dab3e9 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | | Improve build performance on WindowsSimon Hausmann2017-01-095-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the windows search indexing service, which has a tendency to start indexing source code archives that we've just extracted. We are not interested in this service. Change-Id: I1d3f5178a035bc951499d993641a9315db9712ca Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | | | | Update submodules on '5.8' in qt5Liang Qi2017-01-125-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id1cef4535c8f5ef2b7d366b73ca4335e2c58f2a3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | Update submodules on '5.8' in qt5Liang Qi2017-01-114-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I413f02de39f18259ab7bb10054ff75dc0ed04ed0 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | Update submodules on '5.8' in qt5Liang Qi2017-01-1040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0d6757349b933d131aa0eef501dc3e1509a545c4 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.7' into 5.8Simon Hausmann2017-01-085-0/+25
|\| | | | | | | | | | | | | | | | | | | Change-Id: Id9533b63ae2e6d67d8c07101c406c40057c13b9f
| * | | | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2017-01-065-0/+25
| |\| | | | | | | | | | | | | | | | | | Change-Id: I9def17eb03e1c08d1e44c8f90841b1bf5160d638
| | * | | Provisioning: Disable Windows DefenderSimo Fält2017-01-065-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will reduct the timeouts coin has had recently with win machines. Change-Id: I32118f226194a3ea5e3c85d24103ec8341925d3c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Add provision helper file to install compressed packagesTony Sarajärvi2017-01-081-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a7e1af7c91bd11a0cc6379f8bb7762acf42eae5 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | | | Add DownloadURL.sh provisioning helper scriptTony Sarajarvi2017-01-081-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64bef8470555e33772b72847aa76e0e9b4720696 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | | | Add provisioning try-catch helper script for bashTony Sarajarvi2017-01-081-0/+64
| |_|_|/ |/| | | | | | | | | | | | | | | Change-Id: Ia61e503ed5315546421fdeb2f4b8b1be37dab3e9 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | | Merge remote-tracking branch 'origin/5.7' into 5.8Simon Hausmann2016-12-2530-56/+241
|\| | | | | | | | | | | | | | | Change-Id: I49d18025acb322bf45b6cdc38adb05618cb90153
| * | | Updated conan manifests after modification of packagesKonstantin Tokarev2016-12-2412-56/+62
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I60eee501254d41b438085b7b687af6aa2c085dba Reviewed-by: Vitaliy Slobodin <vitaliy.slobodin@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-12-2118-0/+179
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/common/02-python.ps1 Change-Id: I6b5f2c464cc350798c7c73fba9e79a3f4f534586
| | * | Remove shutdown "helpers" for macOSSimon Hausmann2016-12-214-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that they don't quite work the way we expected them to, and instead we Coin is going to shut down the VMs directly at the right time. Change-Id: I9f7a6f2f898002a25544fc513a0c2414fcd5c263 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Provision: Install pyside python dependencies to WindowsSimo Fält2016-12-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To test successfully pyside dependencies with Coin, we need python virtual env. Change-Id: I59c620b7da9c78d2b5c55e233d75597b747a8e84 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 03:10:18 +0000