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

QPluginLoader: Fix the expected machine word for Windows on ARM

Browse Source 
This fixes loading plugins on Windows on ARM
since 892d5607d0b1c9e010ea10a1123e68741c46c21e.

IMAGE_FILE_MACHINE_ARM was used for older Windows targets on ARM,
in particular Windows CE.

Pick-to: 6.4 6.3
Change-Id: I61ef7a6b5920af9192c55209f2641a6c469ad1d2
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Martin Storsjö 2022-09-27 11:18:24 +03:00
parent 7a7051b58f
commit c36412603d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/plugin/qcoffpeparser.cpp
View File

@ -40,7 +40,7 @@ static const WORD ExpectedMachine =
#if 0
// nothing, just so everything is #elf
#elif defined(Q_PROCESSOR_ARM_32)
IMAGE_FILE_MACHINE_ARM
IMAGE_FILE_MACHINE_ARMNT
#elif defined(Q_PROCESSOR_ARM_64)
IMAGE_FILE_MACHINE_ARM64
#elif defined(Q_PROCESSOR_IA64)