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 /src/app/qbs-setup-qt | |
parent | 2adb2749f6e13ce1d035c387ae26d906d3bdd04e (diff) | |
parent | 48fe876e8bb0eb6b5a2abc7c22eaf768d22ab31e (diff) |
Merge 1.13 into master
Change-Id: Idab53d6bd9b6f2841e30d4a31f53ac53a05c2f09
Diffstat (limited to 'src/app/qbs-setup-qt')
-rw-r--r-- | src/app/qbs-setup-qt/setupqt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp index a3af972bf..947cbc5fc 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -142,7 +142,7 @@ static Version msvcVersionFromDirName(const QString &dir) QMap<std::string, std::string> mapping{ std::make_pair("2005", "14"), std::make_pair("2008", "15"), std::make_pair("2010", "16"), std::make_pair("2012", "17"), std::make_pair("2013", "18"), std::make_pair("2015", "19"), - std::make_pair("2017", "19.1") + std::make_pair("2017", "19.1"), std::make_pair("2019", "19.2") }; return Version::fromString(QString::fromStdString(mapping.value(match[1].str()))); } |