diff options
| author | Martin Storsjö <martin@martin.st> | 2022-03-18 09:51:58 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2022-03-19 16:12:57 +0200 |
| commit | 81fb9c5b14a89b47ea648c0a25f79b09ef7c92ad (patch) | |
| tree | 817975b6823a8148f21f30add9bc9aed84a2a315 /src/corelib/global | |
| parent | 4b7225c66211ae242cf6d8dc7624f5de95087b8d (diff) | |
qversiontagging: Fix the imp prefix for 32 bit arm
The underscore symbol prefix is only used on 32 bit x86, not on
other 32 bit architectures such as arm.
Change-Id: Iac82f2d70c8b0c811faa7af5b59805b388b0a00c
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qversiontagging.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/global/qversiontagging.h b/src/corelib/global/qversiontagging.h index 00c847c690..761a0473ad 100644 --- a/src/corelib/global/qversiontagging.h +++ b/src/corelib/global/qversiontagging.h @@ -115,12 +115,12 @@ struct QVersionTag #endif #if defined(Q_OS_WIN) -# ifdef _WIN64 -// 64-bit calling convention does not prepend a _ -# define QT_MANGLE_IMPORT_PREFIX __imp_ -# else -// 32-bit convention does prepend a _ +# ifdef Q_PROCESSOR_X86_32 +// 32-bit x86 convention does prepend a _ # define QT_MANGLE_IMPORT_PREFIX _imp__ +# else +// Calling convention on other architectures does not prepend a _ +# define QT_MANGLE_IMPORT_PREFIX __imp_ # endif # ifdef Q_CC_MSVC # pragma section(".qtversion",read,shared) |