From 3fe89eec61e2c819bb54a5d3dfe4bc29dba49ff3 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Tue, 2 Nov 2021 12:44:34 +0800 Subject: qoperatingsystemversion_win: cache the retrieved version Make it a static variable to avoid acquiring the system version multiple times. The system version won't change at runtime after all. Pick-to: 6.2 Change-Id: Ic381e5dd7b482fedc9c01242482559ffca9d3f2b Reviewed-by: Oliver Wolff --- src/corelib/global/qoperatingsystemversion_win.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/corelib/global/qoperatingsystemversion_win.cpp b/src/corelib/global/qoperatingsystemversion_win.cpp index 37f2362d0c..e8c32be56b 100644 --- a/src/corelib/global/qoperatingsystemversion_win.cpp +++ b/src/corelib/global/qoperatingsystemversion_win.cpp @@ -110,12 +110,14 @@ OSVERSIONINFOEX qWindowsVersionInfo() QOperatingSystemVersion QOperatingSystemVersion::current() { - QOperatingSystemVersion v; - v.m_os = currentType(); - const OSVERSIONINFOEX osv = qWindowsVersionInfo(); - v.m_major = osv.dwMajorVersion; - v.m_minor = osv.dwMinorVersion; - v.m_micro = osv.dwBuildNumber; + static QOperatingSystemVersion v; + if (v.m_os == Unknown) { + v.m_os = currentType(); + const OSVERSIONINFOEX osv = qWindowsVersionInfo(); + v.m_major = osv.dwMajorVersion; + v.m_minor = osv.dwMinorVersion; + v.m_micro = osv.dwBuildNumber; + } return v; } -- cgit v1.2.3