diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-24 09:52:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-24 09:52:30 +0200 |
| commit | dc373186841802f2dd17fcd243efdeca7d5433e9 (patch) | |
| tree | 4fff0a3366b63db97ca5a8b04a220bb0b8c56450 /src/corelib/global | |
| parent | 7d646508c8219408f90103ed13613db8d01a4065 (diff) | |
| parent | cb10ec56f733c34d23c9e5511b19c1e508d0f13f (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/gui/util/qshaderformat.cpp
src/gui/util/qshaderformat_p.h
src/widgets/graphicsview/qgraphicsitem_p.h
Change-Id: Idafd88eb9a0a15b4af29f6143d009c1ec8ceecca
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal_p.h b/src/corelib/global/qglobal_p.h index d52f6268e4..58bc8b7bf3 100644 --- a/src/corelib/global/qglobal_p.h +++ b/src/corelib/global/qglobal_p.h @@ -61,6 +61,9 @@ #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 |