From 7410d11e5e5ccc03a2e0e9530de6def7d5d308b0 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Thu, 16 Jun 2022 15:49:19 +0200 Subject: [PATCH] Added support for newer version of VS2022 + ignore the same warnings in "Release" configuration as in "Release_Static" configuration. --- MUtilities_VS2019.vcxproj | 1 + MUtilities_VS2022.vcxproj | 1 + include/MUtils/Version.h | 6 +++++- src/Terminal_Win32.cpp | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/MUtilities_VS2019.vcxproj b/MUtilities_VS2019.vcxproj index a2e192e..834013e 100644 --- a/MUtilities_VS2019.vcxproj +++ b/MUtilities_VS2019.vcxproj @@ -199,6 +199,7 @@ false false true + 4714;4324;4127 Windows diff --git a/MUtilities_VS2022.vcxproj b/MUtilities_VS2022.vcxproj index 207c499..fe8b2fe 100644 --- a/MUtilities_VS2022.vcxproj +++ b/MUtilities_VS2022.vcxproj @@ -199,6 +199,7 @@ false false true + 4714;4324;4127 Windows diff --git a/include/MUtils/Version.h b/include/MUtils/Version.h index 16ea2ed..0d0f9d6 100644 --- a/include/MUtils/Version.h +++ b/include/MUtils/Version.h @@ -67,7 +67,11 @@ namespace MUtils #error Compiler is not supported! #endif #elif defined(_MSC_VER) - #if (_MSC_VER == 1930) + #if (_MSC_VER == 1932) + "MSVC 2022.2"; + #elif (_MSC_VER == 1931) + "MSVC 2022.1"; + #elif (_MSC_VER == 1930) #if (_MSC_FULL_VER <= 193030706) "MSVC 2022.0"; #else diff --git a/src/Terminal_Win32.cpp b/src/Terminal_Win32.cpp index bdc5e60..b2b510e 100644 --- a/src/Terminal_Win32.cpp +++ b/src/Terminal_Win32.cpp @@ -427,7 +427,7 @@ void MUtils::Terminal::set_icon(const QIcon &icon) bool success = false; if (const SetConsoleIconFun pSetConsoleIconFun = MUtils::Win32Utils::resolve(QLatin1String("kernel32"), QLatin1String("SetConsoleIcon"))) { - const DWORD before = GetLastError(); + //const DWORD before = GetLastError(); if (pSetConsoleIconFun(hIcon)) { success = true; -- 2.11.0