summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Krems <m.krems@software-vision.eu>2015-06-09 06:42:58 +0200
committerMarcel Krems <m.krems@software-vision.eu>2015-06-09 07:59:02 +0000
commit8046a574d27b71ac9540b6cd3c029c2a83dd731e (patch)
treec3068aa838b2f7552a1aa388eb0b06679beaf13e
parent25fb41a58ce20894526573c38e3afa742e86e29d (diff)
Added support for Windows 10 in QSysInfo::productVersion()
Change-Id: I9e21ae62eea6c694e0b3b68dfd14264c3ce76246 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
-rw-r--r--src/corelib/global/qglobal.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index d6f5162648..69066a674d 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2072,6 +2072,8 @@ QSysInfo::WinVersion QSysInfo::windowsVersion()
winver = QSysInfo::WV_WINDOWS8;
else if (override == "WINDOWS8_1")
winver = QSysInfo::WV_WINDOWS8_1;
+ else if (override == "WINDOWS10")
+ winver = QSysInfo::WV_WINDOWS10;
}
#endif
#endif // !Q_OS_WINRT
@@ -2098,6 +2100,8 @@ static const char *winVer_helper()
return "8";
case QSysInfo::WV_WINDOWS8_1:
return "8.1";
+ case QSysInfo::WV_WINDOWS10:
+ return "10";
case QSysInfo::WV_CE:
return "CE";