aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* Upgrade CMake to 3.6.2 on Windows 7 builderKonstantin Tokarev2016-11-071-0/+1
* Update package names and options in qtwebkit conanfilesKonstantin Tokarev2016-11-072-16/+14
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-11-057-0/+0
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-11-035-0/+0
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-2910-0/+0
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-236-0/+0
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-156-0/+0
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-148-0/+0
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-101-0/+0
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-0712-0/+0
* 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
* | | 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