aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86/conanfiles
Commit message (Collapse)AuthorAgeFilesLines
* Provisioning: update Conan and Conan packagesKonstantin Tokarev2019-07-261-6/+15
| | | | | | | | | | | | [*] Update Conan to 1.17.0, adjust to change in command line arguments [*] Update Conan packages to up-to-date versions, add libjpeg-turbo and packages for 64-bit MinGW [*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after Python 3 and MinGW [*] Add license header to conan.ps1 Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Conan: fix names of ICU dll's which are added to qtwebkit binary packageKonstantin Tokarev2017-11-111-3/+3
| | | | | Change-Id: I5e6357e8dc0e5ae44447bc13cfba8429b89934e7 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Conan: update ICU to 59.1, added VS2017 packagesKonstantin Tokarev2017-07-091-1/+1
| | | | | | | | MinGW packages will be upgraded in another patch. Task-number: QTBUG-61728 Change-Id: Ie6a1996b7850282a7cdcbe5ceba61f1ce473cf69 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Provisioning: move Conan manifests to common directoryKonstantin Tokarev2017-07-096-279/+0
| | | | | | | | | We need to use x86 packages from qtci-windows-10-x86_64 configuration, so splitting Conan manifests by configuration is not a good idea anymore. Task-number: QTBUG-61829 Change-Id: I8b2fc00865cce372ca6b5ec75b4775d345d0d18f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Updated conan manifests after modification of packagesKonstantin Tokarev2016-12-246-28/+31
| | | | | | Change-Id: I60eee501254d41b438085b7b687af6aa2c085dba Reviewed-by: Vitaliy Slobodin <vitaliy.slobodin@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Updated conan to 0.16.0Konstantin Tokarev2016-11-301-0/+1
| | | | | | | | | | * Use --no-imports when installing packages, imports will be performed on "make install" step with new "conan imports" command. * Add txt generator to all conanfiles because it will be needed for "conan imports". Change-Id: Ie5e7ac6bfbf14dfa32ce82136b6be5e39476e393 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Verify conan manifests when installing packagesKonstantin Tokarev2016-11-166-0/+276
| | | | | | | | | | | | | This check allows us to ensure authenticity of installed files. Manifests are sorted to minimize diffs in future updates. Manifests lack trailing newline, because adding it would break manifest parser of conan 0.15.0. Task-number: QTQAINFRA-998 Change-Id: I6db75a78ce552da29d63cc4ac03726df326b7be2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fixed conanfile options after packages were renamedKonstantin Tokarev2016-11-161-2/+2
| | | | | Change-Id: I4dbd3ec43bb6edfff7b9f98ac697cc7b70b09cda Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update package names and options in qtwebkit conanfilesKonstantin Tokarev2016-11-071-8/+7
| | | | | | Task-number: QTQAINFRA-997 Change-Id: I19634c06041286fe44c787efe038d5ab24888b1f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Do not use qmake and cmake generator automatically for each conanfileKonstantin Tokarev2016-09-171-0/+1
| | | | | | | | | 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-171-0/+15
| | | | | | Task-number: QTQAINFRA-997 Change-Id: I70b51a47c12928944d9f48be13332fce12296af1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Added conanfiles for qtwebkitKonstantin Tokarev2016-09-141-0/+4
Task-number: QTQAINFRA-997 Change-Id: I7aadf3549affeeeb3130d8fdb9ff15242a36aeb9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>