diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2019-06-17 10:14:08 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-06-17 10:14:08 +0000 |
| commit | ec47b2d46df1490fa84c373e6ca5bf9eaf0d47dd (patch) | |
| tree | 0fecb4ae3c7b6caee1619619484cad01cb96aad0 | |
| parent | ad23c58595f54484f45b00631dc62c6051228a47 (diff) | |
| parent | 1a716f9226ef7a07d82a45a8139cec2e55d130b5 (diff) | |
Merge "Merge 1.13 into master"
| -rw-r--r-- | share/qbs/module-providers/Qt/setup-qt.js | 2 | ||||
| -rw-r--r-- | src/app/qbs-setup-qt/setupqt.cpp | 2 | ||||
| -rw-r--r-- | src/lib/corelib/tools/visualstudioversioninfo.cpp | 4 |
3 files changed, 5 insertions, 3 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]; } 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()))); } diff --git a/src/lib/corelib/tools/visualstudioversioninfo.cpp b/src/lib/corelib/tools/visualstudioversioninfo.cpp index 008ab115d..d4f8844fa 100644 --- a/src/lib/corelib/tools/visualstudioversioninfo.cpp +++ b/src/lib/corelib/tools/visualstudioversioninfo.cpp @@ -60,7 +60,7 @@ VisualStudioVersionInfo::VisualStudioVersionInfo(const Version &version) std::set<VisualStudioVersionInfo> VisualStudioVersionInfo::knownVersions() { static const std::set<VisualStudioVersionInfo> known = { - Version(15), Version(14), Version(12), Version(11), Version(10), Version(9), + Version(16), Version(15), Version(14), Version(12), Version(11), Version(10), Version(9), Version(8), Version(7, 1), Version(7), Version(6) }; return known; @@ -125,6 +125,8 @@ int VisualStudioVersionInfo::marketingVersion() const return 2015; case 15: return 2017; + case 16: + return 2019; default: qWarning() << QStringLiteral("unrecognized Visual Studio version: ") << m_version.toString(); |