summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update submodules on '5.8' in qt5v5.8.0-beta1Qt Submodule Update Bot2016-10-289-0/+0
* Update submodules on '5.8' in qt5Liang Qi2016-10-2713-0/+0
* Update qtquick1 submodule on '5.8' in qt5Fredrik Orderud2016-10-241-0/+0
* Update submodules on '5.8' in qt5Qt Submodule Update Bot2016-10-218-0/+0
* Update submodules on '5.8' in qt5Qt Submodule Update Bot2016-10-2112-0/+0
* Update submodules on '5.8' in qt5Liang Qi2016-10-184-0/+0
* Update submodules on '5.8' in qt5Liang Qi2016-10-1711-0/+0
* Update submodules on '5.8' in qt5Liang Qi2016-10-136-0/+0
* Update submodules on '5.8' in qt5Frederik Gladhorn2016-10-1118-0/+0
* Update submodules on '5.8' in qt5Liang Qi2016-10-061-0/+0
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-0619-8/+177
|\
| * Log arguments passed to Start-Process in Run-Conan-InstallKonstantin Tokarev2016-10-051-1/+7
| * Pass compiler.runtime setting to conanKonstantin Tokarev2016-10-053-5/+12
| * Execute Conan installer synchronouslyKonstantin Tokarev2016-10-051-1/+1
| * Update submodules on '5.7' in qt5Liang Qi2016-10-051-0/+0
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-0413-0/+144
| |\
| | * Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-300-0/+0
| | |\
| | | * Update submodules on '5.6.2' in qt5v5.6.2Qt Submodule Update Bot2016-09-252-0/+0
| | | * Update submodules on '5.6.2' in qt5Qt Submodule Update Bot2016-09-232-0/+0
| | | * Update submodules on '5.6.2' in qt5Qt Submodule Update Bot2016-09-1616-0/+0
| | | * Update submodules on '5.6.2' in qt5Qt Submodule Update Bot2016-09-0516-0/+0
| | | * Adjust submodule branchesOswald Buddenhagen2016-08-241-34/+34
| | * | Python to provisioning for WindowsHeikki Halmet2016-09-3013-0/+164
| * | | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-0215-0/+0
| * | | Revert "Changed slash direction in CI_CONAN_BUILDINFO_DIR"Konstantin Tokarev2016-10-011-1/+1
| * | | Upgrade CMake to 3.6.2Konstantin Tokarev2016-09-303-0/+12
* | | | Update submodules on '5.8' in qt5Qt Submodule Update Bot2016-10-019-0/+0
* | | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-3010-1/+119
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-09-281-1/+1
| |\ \ \ | | |/ /
| | * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-273-0/+0
| | * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-241-0/+0
| | * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-249-0/+0
| | * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-1819-0/+0
| | * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-136-0/+0
| | * | Add Qt Android Extras as dependency for Qt PurchasingEskil Abrahamsen Blomfeldt2016-09-131-1/+1
| * | | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-284-0/+0
| * | | Changed slash direction in CI_CONAN_BUILDINFO_DIRKonstantin Tokarev2016-09-261-1/+1
| * | | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-251-0/+0
| * | | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-2510-0/+0
| * | | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-237-0/+0
| * | | Update submodules on '5.7' in qt5Liang Qi2016-09-2029-0/+0
| * | | Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning WindowsKonstantin Tokarev2016-09-183-4/+4
| * | | Do not use qmake and cmake generator automatically for each conanfileKonstantin Tokarev2016-09-173-1/+3
| * | | Added cmake_installer, imports and explicit library types to conanfilesKonstantin Tokarev2016-09-172-0/+30
| * | | Changed BuildinfoDir of conan to use Coin-compatible compiler nameKonstantin Tokarev2016-09-172-2/+2
| * | | Install conan dependencies if there is conanfile.txt for moduleKonstantin Tokarev2016-09-143-0/+40
| * | | Added conanfiles for qtwebkitKonstantin Tokarev2016-09-142-0/+8
| * | | Install Conan on Win10Konstantin Tokarev2016-09-143-0/+9
| * | | Update Ruby on Win10Konstantin Tokarev2016-09-144-0/+29
* | | | COIN Provisioning: Install ICU to RHEL 7.2Simo Fält2016-09-281-0/+70