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

QDateTime: fix build with MinGW: need unistd.h very early

Browse Source 
qobject.h has #include <chrono>, which #includes <ctime>, which includes
<time.h>.

datetime.cpp:2621:23: error: 'localtime_r' was not declared in this scope; did you mean 'localtime_s'?

Pick-to: 6.2
Change-Id: I2bbf422288924c198645fffd16a922719c4ce7d4
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Thiago Macieira 2021-09-28 17:10:11 -07:00
parent 6d41b64d45
commit 684c9b82b9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/win32-g++/qplatformdefs.h
View File

@ -46,6 +46,8 @@
#endif #endif
#endif #endif
#include <unistd.h> // Defines _POSIX_THREAD_SAFE_FUNCTIONS and others
// Get Qt defines/settings // Get Qt defines/settings
#include "qglobal.h" #include "qglobal.h"

3
src/corelib/time/qdatetime.cpp
View File

@ -66,9 +66,6 @@
# include <qt_windows.h> # include <qt_windows.h>
#endif #endif
#include <time.h> #include <time.h>
#ifdef Q_CC_MINGW
# include <unistd.h> // Define _POSIX_THREAD_SAFE_FUNCTIONS to obtain localtime_r()
#endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE