aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into 5.8.0Liang Qi2016-12-0246-78/+1592
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-12-014-1/+122
| |\
| | * don't fail to check out some modules in pinned modeOswald Buddenhagen2016-11-301-1/+8
| | * refuse to operate with dirty submodulesOswald Buddenhagen2016-11-301-0/+28
| | * Update submodules on '5.6' in qt5Liang Qi2016-11-3035-0/+0
| | * Update submodules on '5.6' in qt5Liang Qi2016-11-262-0/+0
| | * Add basic Ubuntu 16.04 provisioningFrederik Gladhorn2016-11-252-0/+48
| | * Update submodules on '5.6' in qt5Liang Qi2016-11-2510-0/+0
| | * Update submodules on '5.6' in qt5Liang Qi2016-11-234-0/+0
| | * Provision OPENSSL env variable for openSUSE 13.1Tony Sarajärvi2016-11-221-0/+38
| | * Update submodules on '5.6' in qt5Liang Qi2016-11-225-0/+0
| | * Update submodules on '5.6' in qt5Liang Qi2016-11-185-0/+0
| * | Copy conanfile to conanbuildinfos directoryKonstantin Tokarev2016-11-301-2/+5
| * | Updated conan to 0.16.0Konstantin Tokarev2016-11-304-2/+5
| * | Update submodules on '5.7' in qt5Liang Qi2016-11-262-0/+0
| * | Update submodules on '5.7' in qt5Liang Qi2016-11-2533-0/+0
| * | Update Ruby on Win7Konstantin Tokarev2016-11-231-0/+1
| * | Added conan zlib package for MinGW on Windows 7Konstantin Tokarev2016-11-233-0/+62
| * | Update submodules on '5.7' in qt5Liang Qi2016-11-222-0/+0
| * | Update submodules on '5.7' in qt5Liang Qi2016-11-201-0/+0
| * | When installing Python ensure that pip is installed tooKonstantin Tokarev2016-11-181-0/+2
| * | Use full paths for invoking stuff from Python27\ScriptsKonstantin Tokarev2016-11-181-2/+4
| * | Fixed broken conan manifest in qtci-windows-7-x86Konstantin Tokarev2016-11-181-2/+2
| * | Provisioning should fail in case of conan errorsKonstantin Tokarev2016-11-181-2/+9
| * | Rename conan.ps1 and python.ps1 file in configuration dirs tooKonstantin Tokarev2016-11-188-0/+0
| * | Update submodules on '5.7' in qt5Liang Qi2016-11-185-0/+0
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-172-10/+23
| |\|
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-165-0/+0
| | * produce less ugly paths to the commit template in submodulesOswald Buddenhagen2016-11-141-1/+1
| | * add --no-fetch optionOswald Buddenhagen2016-11-141-4/+12
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-1133-0/+0
| | * fix cloning of tagged versionsOswald Buddenhagen2016-11-041-2/+7
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-044-0/+0
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-039-0/+0
| | * Clean up usage of qtsvg as dependencyFrederik Gladhorn2016-11-021-3/+3
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-312-0/+0
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-296-0/+0
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-279-0/+0
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-2212-0/+0
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-144-0/+0
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-114-0/+0
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-091-0/+0
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-0815-0/+0
| * | Install conan from pip instead of exeKonstantin Tokarev2016-11-1610-14/+10
| * | Added MinGW support to conan.ps1, and conanfile for MinGW on Win 7Konstantin Tokarev2016-11-166-633/+666
| * | Verify conan manifests when installing packagesKonstantin Tokarev2016-11-1619-1/+1273
| * | Fixed conanfile options after packages were renamedKonstantin Tokarev2016-11-162-4/+4
| * | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-11-167-0/+0
| * | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-11-1213-0/+0
| * | Upgraded conan to 0.15.0Konstantin Tokarev2016-11-091-3/+3