whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qglobal_p.h: move QT_SUPPORTS_INIT_PRIORITY to outside the C++ section 

Change-Id: Ic15405335d804bdea761fffd16d50d9c5fc5e237
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
bb10
Thiago Macieira 2022-02-18 18:03:24 -08:00
parent 20575393f4
commit 3cccacd624
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,14 +60,6 @@
#include <QtCore/private/qtcore-config_p.h>
#endif
#if defined(__cplusplus)
#ifdef Q_CC_MINGW
# include <unistd.h> // Define _POSIX_THREAD_SAFE_FUNCTIONS to obtain localtime_r()
#endif
#include <time.h>
QT_BEGIN_NAMESPACE
#if defined(Q_CC_MSVC)
# define QT_SUPPORTS_INIT_PRIORITY 1
// warning C4075: initializers put in unrecognized initialization area
@ -87,6 +79,14 @@ QT_BEGIN_NAMESPACE
# define QT_SUPPORTS_INIT_PRIORITY 0
#endif
#if defined(__cplusplus)
#ifdef Q_CC_MINGW
# include <unistd.h> // Define _POSIX_THREAD_SAFE_FUNCTIONS to obtain localtime_r()
#endif
#include <time.h>
QT_BEGIN_NAMESPACE
// These behave as if they consult the environment, so need to share its locking:
Q_CORE_EXPORT void qTzSet();
Q_CORE_EXPORT time_t qMkTime(struct tm *when);