Muldersoft/MUtilities
Muldersoft/MUtilities
1
0
Fork 0
Code Releases Activity

Small improvement to operating system detection.

Browse Source
This commit is contained in:
LoRd_MuldeR 2018-10-28 14:41:52 +01:00
parent 03dda73165
commit b6dd064608
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Startup.cpp
View File

@ -313,8 +313,18 @@ QApplication *MUtils::Startup::create_qt(int &argc, char **argv, const QString &
qDebug("Compiled with Qt v%s\n", QT_VERSION_STR); qDebug("Compiled with Qt v%s\n", QT_VERSION_STR);
#endif #endif
//Check the Windows version //Detect the operating system version
const MUtils::OS::Version::os_version_t &osVersion = MUtils::OS::os_version(); const MUtils::OS::Version::os_version_t &osVersion = MUtils::OS::os_version();
if (const char *const friendlyName = MUtils::OS::os_friendly_name(osVersion))
{
qDebug("Running on %s (NT v%u.%u.%u-sp%u).\n", friendlyName, osVersion.versionMajor, osVersion.versionMinor, osVersion.versionBuild, osVersion.versionSPack);
}
else
{
qWarning("Running on an unknown WindowsNT-based system (v%u.%u.%u-sp%u).\n", osVersion.versionMajor, osVersion.versionMinor, osVersion.versionBuild, osVersion.versionSPack);
}
//Check whether we are running on a supported Windows version
if (xpSupport) if (xpSupport)
{ {
if (!REQUIRE_OS(WINDOWS_WINXP, 3)) if (!REQUIRE_OS(WINDOWS_WINXP, 3))
@ -338,18 +348,6 @@ QApplication *MUtils::Startup::create_qt(int &argc, char **argv, const QString &
qFatal("%s", MUTILS_L1STR(QApplication::tr("Executable '%1' requires Windows 8.1 or later.").arg(executableName))); qFatal("%s", MUTILS_L1STR(QApplication::tr("Executable '%1' requires Windows 8.1 or later.").arg(executableName)));
} }
//Check whether we are running on a supported Windows version
if(const char *const friendlyName = MUtils::OS::os_friendly_name(osVersion))
{
qDebug("Running on %s (NT v%u.%u.%u-sp%u).\n", friendlyName, osVersion.versionMajor, osVersion.versionMinor, osVersion.versionBuild, osVersion.versionSPack);
}
else
{
const QString message = QString().sprintf("Running on an unknown WindowsNT-based system (NT v%u.%u.%u-sp%u).", osVersion.versionMajor, osVersion.versionMinor, osVersion.versionBuild, osVersion.versionSPack);
qWarning("%s\n", MUTILS_UTF8(message));
MUtils::OS::system_message_wrn(MUTILS_WCHR(executableName), MUTILS_WCHR(message));
}
//Check for compat mode //Check for compat mode
if(osVersion.overrideFlag && (osVersion <= MUtils::OS::Version::WINDOWS_WN100)) if(osVersion.overrideFlag && (osVersion <= MUtils::OS::Version::WINDOWS_WN100))
{ {