From a8d42b0f9a8055299279871856c3af46aa70d57a Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Tue, 21 Sep 2021 15:04:04 +0200 Subject: [PATCH] Add MSVC support to MachineInfo --- sources/machine_info.cpp | 2 -- sources/machine_info.h | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sources/machine_info.cpp b/sources/machine_info.cpp index 095f52f55..ae6c85c91 100644 --- a/sources/machine_info.cpp +++ b/sources/machine_info.cpp @@ -179,7 +179,6 @@ void MachineInfo::init_get_Screen_info() */ void MachineInfo::init_get_cpu_info() { -#ifdef __GNUC__ #ifdef __APPLE_CC__ init_get_cpu_info_macos(); #else @@ -188,7 +187,6 @@ void MachineInfo::init_get_cpu_info() if (pc.os.type == "winnt") init_get_cpu_info_winnt(); #endif -#endif } /** diff --git a/sources/machine_info.h b/sources/machine_info.h index e991a5564..4ec988a22 100644 --- a/sources/machine_info.h +++ b/sources/machine_info.h @@ -82,12 +82,14 @@ class MachineInfo struct Built { QString version= - #ifdef __GNUC__ - #ifdef __APPLE_CC__ +#ifdef __GNUC__ +#ifdef __APPLE_CC__ "CLANG " + QString(__clang_version__); - #else +#else "GCC " + QString(__VERSION__); #endif +#elif defined(Q_CC_MSVC) + "MSVC " + QString(QT_STRINGIFY(_MSC_FULL_VER)); #endif QString QT=QString(QT_VERSION_STR); QString date=QString(__DATE__);