Skip to content

Commit

Permalink
QPluginLoader: Fix the expected machine word for Windows on ARM
Browse files Browse the repository at this point in the history
This fixes loading plugins on Windows on ARM
since 892d560.

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 <[email protected]>
  • Loading branch information
mstorsjo committed Sep 27, 2022
1 parent 7a7051b commit c364126
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/corelib/plugin/qcoffpeparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit c364126

Please sign in to comment.