1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Q_DECL_INIT_PRIORITY: make the initializers actually run

Browse Source 
The runtime runs the function pointers located between subsections $XCA
and $XCZ only, so using $QT meant it would never get run.

Change-Id: Ibf4acec0f166495998f7fffd16d8ecb19019ce10
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Thiago Macieira 2022-03-03 08:45:11 -08:00
parent 9eae3e9b60
commit 41b2c4204b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/global/qglobal_p.h
View File

@ -61,11 +61,16 @@
#endif
#if defined(Q_CC_MSVC)
// By default, dynamic initialization uses subsection "$XCU", which is
// equivalent to #pragma init_seg(user). Additionally, #pragma
// init_seg(compiler) and init_seg(lib) use "$XCC" and "$XCL" respectively. So
// place us between "compiler" and "lib".
# define QT_SUPPORTS_INIT_PRIORITY 1
// warning C4075: initializers put in unrecognized initialization area
# define Q_DECL_INIT_PRIORITY(nn) \
__pragma(warning(disable: 4075)) \
__pragma(init_seg(".CRT$QT" QT_STRINGIFY(nn))) Q_DECL_UNUSED
__pragma(init_seg(".CRT$XCK" QT_STRINGIFY(nn))) Q_DECL_UNUSED
#elif defined(Q_OS_WIN) || defined(Q_OF_ELF)
# define QT_SUPPORTS_INIT_PRIORITY 1
// priorities 0 to 1000 are reserved to the runtime;