diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-06-14 16:24:19 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-06-14 16:24:19 +0200 |
| commit | 1a716f9226ef7a07d82a45a8139cec2e55d130b5 (patch) | |
| tree | f65382b329ae68f142c80239830024f34e8f55eb /share | |
| parent | 2adb2749f6e13ce1d035c387ae26d906d3bdd04e (diff) | |
| parent | 48fe876e8bb0eb6b5a2abc7c22eaf768d22ab31e (diff) | |
Merge 1.13 into master
Change-Id: Idab53d6bd9b6f2841e30d4a31f53ac53a05c2f09
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/module-providers/Qt/setup-qt.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js index 0206a16d3..0ee9db58f 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -126,7 +126,7 @@ function isMsvcQt(qtProps) { return qtProps.mkspecName.startsWith(msvcPrefix()); function msvcCompilerVersionForYear(year) { var mapping = { "2005": "14", "2008": "15", "2010": "16", "2012": "17", "2013": "18", "2015": "19", - "2017": "19.1" + "2017": "19.1", "2019": "19.2" }; return mapping[year]; } |