AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the namespace-mangled symbol for the qt_version_tag group name

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2017-06-13 09:44:46 -07:00
parent c7ea60d1ab
commit 9bec818ccc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qversiontagging.h
View File

@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
# endif # endif
# define QT_VERSION_TAG(sym) \ # define QT_VERSION_TAG(sym) \
asm ( \ 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" \ ".align 8\n" \
QT_VERSION_TAG_RELOC(sym) \ QT_VERSION_TAG_RELOC(sym) \
".long " QT_STRINGIFY(QT_VERSION) "\n" \ ".long " QT_STRINGIFY(QT_VERSION) "\n" \