diff options
| author | Martin Storsjö <martin@martin.st> | 2022-09-27 11:18:24 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-09-28 11:21:41 +0000 |
| commit | e05c700195fa7df7cc1609261aa0ed482812bdd9 (patch) | |
| tree | b84acde4862f9d3de9b1446c6fd4aeea794be7cf | |
| parent | 018d0131818d00b18c793a4f7001c56fdd84229f (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.
Change-Id: I61ef7a6b5920af9192c55209f2641a6c469ad1d2
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit c36412603dd798007f7acc0b12b8a7754ee90c4b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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 15d1f64426..f4f9e21891 100644 --- a/src/corelib/plugin/qcoffpeparser.cpp +++ b/src/corelib/plugin/qcoffpeparser.cpp @@ -75,7 +75,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) |