1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qglobal: resolve one Qt6 TODO

Browse Source 
Tested with MSVC 2022 locally and this change doesn't
break the bootstrapped builds.

Change-Id: Ieeb9a77035d889b9c1ed0c0c3488ac8802879282
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Yuhang Zhao 2022-05-20 14:22:09 +08:00
parent 1ae4ffefbb
commit 80996d2e5d
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/global/qglobal.cpp
View File

@ -3003,18 +3003,10 @@ QByteArray QSysInfo::machineUniqueId()
}
#elif defined(Q_OS_WIN)
// Let's poke at the registry
// ### Qt 6: Use new helpers from qwinregistry.cpp (once bootstrap builds are obsolete)
HKEY key = NULL;
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Cryptography", 0, KEY_READ | KEY_WOW64_64KEY, &key)
== ERROR_SUCCESS) {
wchar_t buffer[UuidStringLen + 1];
DWORD size = sizeof(buffer);
bool ok = (RegQueryValueEx(key, L"MachineGuid", NULL, NULL, (LPBYTE)buffer, &size) ==
ERROR_SUCCESS);
RegCloseKey(key);
if (ok)
return QStringView(buffer, (size - 1) / 2).toLatin1();
}
const QString machineGuid = QWinRegistryKey(HKEY_LOCAL_MACHINE, LR"(SOFTWARE\Microsoft\Cryptography)")
.stringValue(u"MachineGuid"_s);
if (!machineGuid.isEmpty())
return machineGuid.toLatin1();
#endif
return QByteArray();
}