diff options
| author | Martin Storsjö <martin@martin.st> | 2022-09-27 11:18:24 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2022-09-27 21:59:21 +0300 |
| commit | c36412603dd798007f7acc0b12b8a7754ee90c4b (patch) | |
| tree | 6520e517608d38fe653e78361c9e043d68c0c9b7 /src/corelib/plugin/qcoffpeparser.cpp | |
| parent | 7a7051b58f78a85cc55aece7b8691583c33ac47e (diff) | |
QPluginLoader: Fix the expected machine word for Windows on ARM
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>
Diffstat (limited to 'src/corelib/plugin/qcoffpeparser.cpp')
| -rw-r--r-- | src/corelib/plugin/qcoffpeparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qcoffpeparser.cpp b/src/corelib/plugin/qcoffpeparser.cpp index e037f135d16..054a433603d 100644 --- a/src/corelib/plugin/qcoffpeparser.cpp +++ b/src/corelib/plugin/qcoffpeparser.cpp @@ -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) |