summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86/conanfiles
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-09-16 21:18:46 +0300
committerSimon Hausmann <simon.hausmann@qt.io>2016-09-17 11:06:44 +0000
commite1bfa77391fcf3d50f0d9f9375f5d123710395cf (patch)
treed7fbce04c2c4c29c2236d3811e1f1a5668d5e59b /coin/provisioning/qtci-windows-10-x86/conanfiles
parentfd6fe04cad632edc4e127038c5312cbe5ce6a17b (diff)
Do not use qmake and cmake generator automatically for each conanfile
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>
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86/conanfiles')
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
index 8e0447d0..d1fcbfba 100644
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
+++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
@@ -5,6 +5,7 @@ libxml2-qt/2.9.4@Vitallium/stable
libxslt-qt/1.1.29@Vitallium/stable
[generators]
+cmake
virtualenv
[options]