From 156afbc9b855209b049b73176e03ce400881e96f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Tue, 15 Mar 2022 12:48:12 +0100 Subject: [PATCH] Fix qt version tagging on windows with namespaces The libraries linking to QtCore were looking for __imp_qt_version_tag_6_4 but the exported symbol was __imp_qt_version_tag_NAMESPACE_6_4 (with the mangled namespace) Change-Id: Ida7b18bea4b5e7dab9c0efb63279779d1af898cb Reviewed-by: Thiago Macieira --- src/corelib/global/qversiontagging.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/global/qversiontagging.h b/src/corelib/global/qversiontagging.h index 23e7683e6a0..00c847c6902 100644 --- a/src/corelib/global/qversiontagging.h +++ b/src/corelib/global/qversiontagging.h @@ -159,7 +159,7 @@ struct QVersionTag # ifndef QT_VERSION_TAG_SECTION # define QT_VERSION_TAG_SECTION __attribute__((section(".qtversion"))) # endif -# define QT_MANGLED_VERSION_TAG_IMPORT QT_VERSION_TAG_SYMBOL(QT_MANGLE_IMPORT_PREFIX, qt_version_tag, QT_VERSION_MAJOR, QT_VERSION_MINOR) +# define QT_MANGLED_VERSION_TAG_IMPORT QT_VERSION_TAG_SYMBOL(QT_MANGLE_IMPORT_PREFIX, QT_MANGLE_NAMESPACE(qt_version_tag), QT_VERSION_MAJOR, QT_VERSION_MINOR) # define QT_MANGLED_VERSION_TAG QT_VERSION_TAG_SYMBOL(, QT_MANGLE_NAMESPACE(qt_version_tag), QT_VERSION_MAJOR, QT_VERSION_MINOR) QT_VERSION_TAG(QT_MANGLED_VERSION_TAG, QT_MANGLED_VERSION_TAG_IMPORT);