Skip to content

(Windows) Add manifest for accurate OS version detection #10321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
strseb merged 1 commit into from
Jan 14, 2026
Merged

(Windows) Add manifest for accurate OS version detection #10321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/models/devicemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,10 +294,10 @@ void DeviceModel::logSerialize(QIODevice* device) {
out << "Machine arch -> " << QSysInfo::currentCpuArchitecture() << Qt::endl;
out << "OS -> " << QSysInfo::productType() << Qt::endl;
#ifdef MZ_WINDOWS
out << "OS Version -> " << WindowsUtils::windowsVersion() << Qt::endl;
#else
out << "OS Version -> " << QSysInfo::productVersion() << Qt::endl;
out << "OS Version (Reg) -> " << WindowsUtils::windowsVersion() << Qt::endl;
#endif
out << "OS Version -> " << QSysInfo::productVersion() << Qt::endl;

#ifdef MZ_ANDROID
out << "SDK Version -> " << AndroidCommons::getSDKVersion() << Qt::endl;
out << "Manufacturer -> " << AndroidCommons::GetManufacturer() << Qt::endl;
Expand Down
3 changes: 3 additions & 0 deletions windows/version.rc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@

IDI_ICON1 ICON "@CMAKE_SOURCE_DIR@/src/ui/resources/logo.ico"

// Embed application manifest as resource (ID 1 is standard for app manifests)
1 RT_MANIFEST "@CMAKE_SOURCE_DIR@/windows/vpn.manifest"

// See https://docs.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource
// for a list of all the neat metadata we can set in this file.
VS_VERSION_INFO VERSIONINFO
Expand Down
28 changes: 28 additions & 0 deletions windows/vpn.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"
xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">

<trustInfo>
<security>
<requestedPrivileges>
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>

<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- Max Tested: Windows 11 24H2 -->
<maxversiontested Id="10.0.26100.0"/>
<!-- Supports Windows 10 and Windows 11 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application>
</compatibility>

<asmv3:application>
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
<dpiAwareness>PerMonitorV2</dpiAwareness>
</asmv3:windowsSettings>
</asmv3:application>

</assembly>
Loading