feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Detect "native" host architecture when running in x86 emulation on Windows on ARM

Browse Source 
When Creator is run as an x64 executable on a Windows on ARM machine,
the auto detection of debuggers and compilers will not work as expected
without this patch.

Change-Id: I8b0b303b1db097f8cd95bb419c6a21b9a15e1ac8
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
This commit is contained in:
Oliver Wolff
2024-08-26 10:52:01 +02:00
parent 4ebf7e8415
commit 83a310e5ce
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/utils/hostosinfo.cpp
View File

@@ -31,7 +31,23 @@ bool HostOsInfo::m_useOverrideFileNameCaseSensitivity = false;
OsArch HostOsInfo::hostArchitecture() OsArch HostOsInfo::hostArchitecture()
{ {
static const OsArch arch = osArchFromString(QSysInfo::currentCpuArchitecture()); #ifdef Q_OS_WIN
// Workaround for Creator running in x86 emulation mode on ARM machines
static const OsArch arch = []() {
const HANDLE procHandle = GetCurrentProcess();
ushort processMachine;
ushort nativeMachine;
if (IsWow64Process2(procHandle, &processMachine, &nativeMachine)
&& nativeMachine == IMAGE_FILE_MACHINE_ARM64) {
return OsArchArm64;
}
return osArchFromString(QSysInfo::currentCpuArchitecture());
}();
#else
static const OsArch arch = osArchFromString(QSysInfo::currentCpuArchitecture());
#endif
return arch; return arch;
} }