summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2021-01-26 08:03:39 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2021-01-26 08:00:35 +0000
commit46074c4a636d7722cdc5aa48b3e0309c087f98af (patch)
tree7c854980a6060428171418a18d47d13a76ef3243
parentff91abdee935c120f867e49e3c35d572c8013891 (diff)
Add 'CONAN_CMAKE_GENERATOR=Ninja' in MSVC2019 conan profiles
Fixes: QTBUG-90532 Fixes: QTBUG-90527 Fixes: QTBUG-90528 Fixes: QTBUG-90526 Fixes: QTBUG-90524 Fixes: QTBUG-90523 Change-Id: Ibcbc74d2ef470f8123439cfd1e71be6c577273ee Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--profiles/qt/windows/6.0.0/qt-6.0.0-msvc2019_641
-rw-r--r--profiles/qt/windows/6.0.1/qt-6.0.1-msvc2019_641
2 files changed, 2 insertions, 0 deletions
diff --git a/profiles/qt/windows/6.0.0/qt-6.0.0-msvc2019_64 b/profiles/qt/windows/6.0.0/qt-6.0.0-msvc2019_64
index 333cb4f..5020732 100644
--- a/profiles/qt/windows/6.0.0/qt-6.0.0-msvc2019_64
+++ b/profiles/qt/windows/6.0.0/qt-6.0.0-msvc2019_64
@@ -9,4 +9,5 @@ qt6=6.0.0
[build_requires]
[env]
QT_PATH=%QT_VERSION_PATH%/msvc2019_64
+CONAN_CMAKE_GENERATOR=Ninja
diff --git a/profiles/qt/windows/6.0.1/qt-6.0.1-msvc2019_64 b/profiles/qt/windows/6.0.1/qt-6.0.1-msvc2019_64
index 1f39918..4703e0c 100644
--- a/profiles/qt/windows/6.0.1/qt-6.0.1-msvc2019_64
+++ b/profiles/qt/windows/6.0.1/qt-6.0.1-msvc2019_64
@@ -9,4 +9,5 @@ qt6=6.0.1
[build_requires]
[env]
QT_PATH=%QT_VERSION_PATH%/msvc2019_64
+CONAN_CMAKE_GENERATOR=Ninja