summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.8' in qt5v5.8.0-beta1Qt Submodule Update Bot2016-10-289-0/+0
| | | | | Change-Id: I762434e6bb122ac5118e73672ce443bb3009d829 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.8' in qt5Liang Qi2016-10-2713-0/+0
| | | | | Change-Id: Iedd29491fc105df54ab9e670bea8f1d0becb1e23 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update qtquick1 submodule on '5.8' in qt5Fredrik Orderud2016-10-241-0/+0
| | | | | | | | | Fixes broken build caused by qtquick1 not being in sync with interface changes in qtbase. Task-number: QTBUG-56642 Change-Id: I972bcef2564c4f9bd7abe1a3e38c77339aaf30e9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.8' in qt5Qt Submodule Update Bot2016-10-218-0/+0
| | | | | Change-Id: I70a3a9621a800f655406d4827f533c2378963312 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.8' in qt5Qt Submodule Update Bot2016-10-2112-0/+0
| | | | | Change-Id: Ia4c6e9eae9eab645779dfc31818527fcef3e5fe2 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.8' in qt5Liang Qi2016-10-184-0/+0
| | | | | | | Exclude qtbase to avoid QTBUG-56580. Change-Id: I70cd6027112a94824fdea2264866bfaeda8ee41c Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.8' in qt5Liang Qi2016-10-1711-0/+0
| | | | | Change-Id: I30d63257b6a095fd75c41bf97e24f584374eb542 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.8' in qt5Liang Qi2016-10-136-0/+0
| | | | | | | One more without qtdeclarative update. Change-Id: I45afafd217da9153c7ce18336f9ab1d5d9530d8b Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.8' in qt5Frederik Gladhorn2016-10-1118-0/+0
| | | | | | | | Since qtdeclarative seems to trigger a crash in qtquickcontrols' tests, leave it out for now, just to see some progress. Change-Id: I8799f0ae70ad9b78f5be4cb7a53cbeac7df3295b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Update submodules on '5.8' in qt5Liang Qi2016-10-061-0/+0
| | | | | Change-Id: I423324fe84f2bb434fad8a717d05eae680a94e69 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-0619-8/+177
|\ | | | | | | Change-Id: Ic1d8d79b979cb77fe93acae2c279cf8a4f4e2a71
| * Log arguments passed to Start-Process in Run-Conan-InstallKonstantin Tokarev2016-10-051-1/+7
| | | | | | | | | | | | Task-number: QTQAINFRA-998 Change-Id: Ic27762a0403132cb8c2dcdb9f5a83ae9292e2d2a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Pass compiler.runtime setting to conanKonstantin Tokarev2016-10-053-5/+12
| | | | | | | | | | | | | | | | | | | | When MSVC is not autodected, necessary setting compiler.runtime has undefined value, breaking installation of packages. This setting is not supported by MinGW, so it should be optional. Task-number: QTQAINFRA-998 Change-Id: Ia1a09eee14275314c160c7c45cd6ab276367dcdb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Execute Conan installer synchronouslyKonstantin Tokarev2016-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | PowerShell runs .exe's asynchronously by default, unlike all other commands. This behavior creates race condition when conanfile processing starts before conan installation is completed. Addition of "| Out-Null" to installer invocation makes it synchronous. Task-number: QTQAINFRA-998 Change-Id: Ic423514f15886e6ad9eb5c9422dd5382a3362380 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on '5.7' in qt5Liang Qi2016-10-051-0/+0
| | | | | | | | | | Change-Id: Ifb5d6145b2c4b4bf881cf6414d2b5c76382c8757 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-0413-0/+144
| |\ | | | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/common/helpers.ps1 Change-Id: I9bf6180f7d2ee1ff1c7722eed3c21d416ba7410e
| | * Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-300-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Ifffec3df90687a6ad84547bb0f603b0446bf0e9d
| | | * Update submodules on '5.6.2' in qt5v5.6.2Qt Submodule Update Bot2016-09-252-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I337a9d4897efe57d3ac09d9981bb2b07f96a9d87 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Update submodules on '5.6.2' in qt5Qt Submodule Update Bot2016-09-232-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I47372eb19e0f038e1ec1999a183125ed1c5300c7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Update submodules on '5.6.2' in qt5Qt Submodule Update Bot2016-09-1616-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I623adf43a36ff5cd8de844ae533063523efe2b02 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Update submodules on '5.6.2' in qt5Qt Submodule Update Bot2016-09-0516-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie03202844e195a89cb536fde6b3c357929737cf8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Adjust submodule branchesOswald Buddenhagen2016-08-241-34/+34
| | | | | | | | | | | | | | | | Change-Id: Ibc4de8e8a06cf2391ae33be2d02fc21f4e3ab70f
| | * | Python to provisioning for WindowsHeikki Halmet2016-09-3013-0/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Installs Python version 2.7.10. Python is required for building Qt 5 from source. More specifically qtdeclarative and qtwebkit require it. Change-Id: I63c8f3294a8a4799df5e52fbd41a36db8686950e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-0215-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Icb268cea1648c3219be1bb2ac8d9819971e9a033 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | | Revert "Changed slash direction in CI_CONAN_BUILDINFO_DIR"Konstantin Tokarev2016-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This actually breaks conan integration in Coin instead of fixing it. This reverts commit b0b0c9c471359393697389c870aaaad51dbb022f. Change-Id: Ifbdc9dbfd89d5b670221463e6d303691ad45936d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Upgrade CMake to 3.6.2Konstantin Tokarev2016-09-303-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on Windows 10 machines. Task-number: QTQAINFRA-996 Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update submodules on '5.8' in qt5Qt Submodule Update Bot2016-10-019-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I3edb8eeb7f599148ba577aea3c6677e8e6423d69 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-3010-1/+119
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I4060b0ddeb5a77c40b31e1ce1dafd2e878b48e12
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-09-281-1/+1
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ibf285f0d67fc5125c1c7da6dfc5b62b834d34867
| | * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-273-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I76cd6f71dd61e2478b73d39163e7fbe4b8f6afe6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-241-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifa9a8c1e59cf8e286c4a52b6936720da76f92073 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-249-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I66d3689ab56b1b8b1c754ced12456ff7e86052f7 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-1819-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id7fba5c79f44c2081ed49ce8f7050b8eacfb76ef Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-136-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id80b5734e19aa6f15d90b11abef9f9c183290292 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | Add Qt Android Extras as dependency for Qt PurchasingEskil Abrahamsen Blomfeldt2016-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia7b9d966777470642e0ee0ad3e9c82496ce93950 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
| * | | 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>
* | | | COIN Provisioning: Install ICU to RHEL 7.2Simo Fält2016-09-281-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d99c9e8a10b89f430fd6a07932b9330cfb49726 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>