mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-17 20:50:34 +01:00
Add MSVC support to MachineInfo
This commit is contained in:
committed by
Laurent Trinques
parent
b69c7b1027
commit
a8d42b0f9a
@@ -179,7 +179,6 @@ void MachineInfo::init_get_Screen_info()
|
|||||||
*/
|
*/
|
||||||
void MachineInfo::init_get_cpu_info()
|
void MachineInfo::init_get_cpu_info()
|
||||||
{
|
{
|
||||||
#ifdef __GNUC__
|
|
||||||
#ifdef __APPLE_CC__
|
#ifdef __APPLE_CC__
|
||||||
init_get_cpu_info_macos();
|
init_get_cpu_info_macos();
|
||||||
#else
|
#else
|
||||||
@@ -188,7 +187,6 @@ void MachineInfo::init_get_cpu_info()
|
|||||||
if (pc.os.type == "winnt")
|
if (pc.os.type == "winnt")
|
||||||
init_get_cpu_info_winnt();
|
init_get_cpu_info_winnt();
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -82,12 +82,14 @@ class MachineInfo
|
|||||||
struct Built
|
struct Built
|
||||||
{
|
{
|
||||||
QString version=
|
QString version=
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
#ifdef __APPLE_CC__
|
#ifdef __APPLE_CC__
|
||||||
"CLANG " + QString(__clang_version__);
|
"CLANG " + QString(__clang_version__);
|
||||||
#else
|
#else
|
||||||
"GCC " + QString(__VERSION__);
|
"GCC " + QString(__VERSION__);
|
||||||
#endif
|
#endif
|
||||||
|
#elif defined(Q_CC_MSVC)
|
||||||
|
"MSVC " + QString(QT_STRINGIFY(_MSC_FULL_VER));
|
||||||
#endif
|
#endif
|
||||||
QString QT=QString(QT_VERSION_STR);
|
QString QT=QString(QT_VERSION_STR);
|
||||||
QString date=QString(__DATE__);
|
QString date=QString(__DATE__);
|
||||||
|
|||||||
Reference in New Issue
Block a user