summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on 'dev' in qt5Liang Qi2017-01-1317-0/+0
| | | | | Change-Id: I848fb61ce1e338d56bf665ad285d69b90bee06b9 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Liang Qi2016-12-2512-0/+0
| | | | | Change-Id: Iea0ccd093912ab6a7ecb866c2592f23995a624d5 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Liang Qi2016-12-155-0/+0
| | | | | Change-Id: I37b7fb682d4d8db6cdc87ab8f10be55bc1094bd9 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Liang Qi2016-12-1418-0/+0
| | | | | Change-Id: I6624474fd032d697e851fa9ef0d087fde25195ae Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Liang Qi2016-12-1210-0/+0
| | | | | Change-Id: I6da970179afdf84cc629190c1a8b2595c35d4a06 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Liang Qi2016-12-018-0/+0
| | | | | Change-Id: If15f5387b25fd86b6b1b481f0ec25928304d8c05 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Liang Qi2016-11-268-0/+0
| | | | | Change-Id: Ib6ed9acdc2de652ed0581ab2ce322bea072fec07 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Liang Qi2016-11-228-0/+0
| | | | | Change-Id: I301370485589fd11d69a3722e29818f037c75b43 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Liang Qi2016-11-179-0/+0
| | | | | Change-Id: I0c6056a80c3b5a078f8fe7e3a28206d50856fcb0 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2016-11-138-0/+0
| | | | | Change-Id: Ic6fdae41e0064726fa0349e6d153ce1ce6cabdba Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Liang Qi2016-11-1116-0/+0
| | | | | Change-Id: I8cd3169f2fd6d00006175b8012134450e44b3bb3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2016-10-223-0/+0
| | | | | Change-Id: Ic719d17edc11df7808a381627695655ba659148f Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2016-10-204-0/+0
| | | | | Change-Id: I1aa41dfd34b34f97a515a2969f512c41386137e3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2016-10-196-0/+0
| | | | | | Change-Id: I9fb801475eb21c37d5d33b4fb14d4700554a5149 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2016-10-1211-0/+0
| | | | | Change-Id: Ic0831856c7b3d9014068c48f10d776085e16ba7c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on 'dev' in qt5Liang Qi2016-10-071-0/+0
| | | | | Change-Id: I33398bb5031c34b1afb24d992fdaebca86e987d1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-0719-8/+177
|\ | | | | | | Change-Id: Ib37d1a012dad4bcb3b830d2557dab1ed6cb091ea
| * 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>
* | | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2016-10-046-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I737902b8cc54ce8394c377f6cdafe14c49c2a588 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | | | Update submodules on 'dev' in qt5Liang Qi2016-10-0131-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id24be2272e6fe7256c6f96c1c54c2baf933f793f Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-3018-8/+347
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I6f517c976152f2da390c556c7c9da08aaec4be90
| * | | | 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>