summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-06 01:01:08 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-06 01:01:08 +0200
commit2c4b44d7500be72b6eb74c4989e7311b3f924119 (patch)
tree8cf8cb8aa36f18ee9474486178f51c7fe0770ee8 /src/corelib/global/qglobal.cpp
parent7e2016de5ee6d9cc2c5d6b94fab4bc56a8a33303 (diff)
parent327b305e95187fda869c5af407e78a17e0e381cd (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
-rw-r--r--src/corelib/global/qglobal.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 63ad44f79a..114a4d71e2 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2956,11 +2956,10 @@ QString QSysInfo::prettyProductName()
if (!name)
return result + versionString;
result += QLatin1String(name);
-# if !defined(Q_OS_WIN)
- return result + QLatin1String(" (") + versionString + QLatin1Char(')');
-# else
+# if !defined(Q_OS_WIN) || defined(Q_OS_WINRT)
+ return result + QLatin1String(" (") + versionString + QLatin1Char(')');
+# else
// (resembling winver.exe): Windows 10 "Windows 10 Version 1809"
- result += QLatin1String(" Version ");
if (majorVersion >= 10) {
const auto releaseId = windows10ReleaseId();
if (!releaseId.isEmpty())
@@ -2968,7 +2967,7 @@ QString QSysInfo::prettyProductName()
return result;
}
// Windows 7: "Windows 7 Version 6.1 (Build 7601: Service Pack 1)"
- result += versionString + QLatin1String(" (");
+ result += QLatin1String(" Version ") + versionString + QLatin1String(" (");
const auto build = windows7Build();
if (!build.isEmpty())
result += QLatin1String("Build ") + build;
@@ -2976,7 +2975,7 @@ QString QSysInfo::prettyProductName()
if (!servicePack.isEmpty())
result += QLatin1String(": ") + servicePack;
return result + QLatin1Char(')');
-# endif // Windows
+# endif // Windows
#elif defined(Q_OS_HAIKU)
return QLatin1String("Haiku ") + productVersion();
#elif defined(Q_OS_UNIX)