From bdce965723997ff84aa9578cbf51759908584fb0 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 28 May 2019 14:17:28 +0200 Subject: Version bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I475736e1fb146858264cc1da99554630c3af30a9 Reviewed-by: Jörg Bornemann --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b50dd27dd..61ce01b30 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.13.1 +1.13.2 -- cgit v1.2.3 From 48fe876e8bb0eb6b5a2abc7c22eaf768d22ab31e Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 6 Jun 2019 08:56:43 +0200 Subject: Add Visual Studio 2019 support Fixes: QBS-1451 Change-Id: I644835cf8ce18d546e6c8e2c75f689766456555d Reviewed-by: Orgad Shaneh --- share/qbs/module-providers/Qt/setup-qt.js | 2 +- src/app/qbs-setup-qt/setupqt.cpp | 2 +- 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 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::knownVersions() { static const std::set 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(); -- cgit v1.2.3