Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

Merge branch 'v2.0'

Browse Source
This commit is contained in:
David Rosca 2016-06-14 13:16:41 +02:00
commit 59278fa4d9
1 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/lib/tools/qztools.cpp
View File

@ -920,15 +920,19 @@ QString QzTools::operatingSystem()
str.append(" 7"); str.append(" 7");
break; break;
default: case QSysInfo::WV_WINDOWS8:
OSVERSIONINFO osvi; str.append(" 8");
ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); break;
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&osvi);
if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 2) { case QSysInfo::WV_WINDOWS8_1:
str.append(" 8"); str.append(" 8.1");
} break;
case QSysInfo::WV_WINDOWS10:
str.append(" 10");
break;
default:
break; break;
} }
@ -938,31 +942,7 @@ QString QzTools::operatingSystem()
QString QzTools::cpuArchitecture() QString QzTools::cpuArchitecture()
{ {
#if defined(__x86_64__) || defined(_M_X64) return QSysInfo::currentCpuArchitecture();
return QSL("x86_64");
#endif
#if defined(_M_IX86)
return QSL("x86");
#endif
#if defined(__i686__)
return QSL("i686");
#endif
#if defined(__i586__)
return QSL("i586");
#endif
#if defined(__i486__)
return QSL("i486");
#endif
#if defined(__i386__)
return QSL("i386");
#endif
#if defined(__aarch64__)
return QSL("arm64");
#endif
#if defined(__arm__) || defined(_M_ARM)
return QSL("arm");
#endif
return QString();
} }
QString QzTools::operatingSystemLong() QString QzTools::operatingSystemLong()