summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-06-13 09:44:46 -0700
committerThiago Macieira <thiago.macieira@intel.com>2017-07-07 07:22:03 +0000
commit9bec818ccc0c0eddd3029540f65e3be26eae29db (patch)
tree0f0f7f1976a43ff2fb948770352f21a908c6d819 /src
parentc7ea60d1abd65d5c85fc5e690a28935c9b4a2dec (diff)
Use the namespace-mangled symbol for the qt_version_tag group name
Doesn't affect our current builds since it's just a marker for the linker on what sections should be merged. Unless you're mixing namespaced and non-namespaced static builds into one executable. Change-Id: Ia53158e207a94bf49489fffd14c7bc294fccf8f9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qversiontagging.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qversiontagging.h b/src/corelib/global/qversiontagging.h
index 3ed02c7376..75c2e9df7e 100644
--- a/src/corelib/global/qversiontagging.h
+++ b/src/corelib/global/qversiontagging.h
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
# endif
# define QT_VERSION_TAG(sym) \
asm ( \
- ".section .qtversion, \"aG\", @progbits, qt_version_tag, comdat\n" \
+ ".section .qtversion, \"aG\", @progbits, " QT_STRINGIFY(QT_MANGLE_NAMESPACE(sym)) ", comdat\n" \
".align 8\n" \
QT_VERSION_TAG_RELOC(sym) \
".long " QT_STRINGIFY(QT_VERSION) "\n" \