diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2018-08-01 08:42:45 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-08-02 07:10:00 +0000 |
| commit | 780dc2291bc0e114bab8b9ccd8706708f6b47270 (patch) | |
| tree | 5b7d31b567afe2a29e0efdb8e1cd788f6cca5860 | |
| parent | c5af04cf8aa7bf2fbeaaf2a40f169fe8c17239f1 (diff) | |
| download | qtbase-780dc2291bc0e114bab8b9ccd8706708f6b47270.tar.gz | |
Fix builds with some MinGW distributions
Some distributions do not define MINGW_HAS_SECURE_API globally,
resulting in methods like wgetenv_s not being declared in the
headers.
This is probably to keep compatibility with Windows XP. Anyhow,
we don't support Windows XP anymore, so we can safely add the
define.
Note that this is not necessary for the mingw-builds distro,
which is the only one we test and support. Anyhow, I don't
see any risk in adding these for other distributions.
Diff was provided by Philippe Dunski in the bug report.
Task-number: QTBUG-67443
Change-Id: I3a64b11541fe95e527ed44bbf8ad94469d457d3d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | mkspecs/common/g++-win32.conf | 2 | ||||
| -rw-r--r-- | qmake/Makefile.unix.win32 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf index 610503379d..f0df324b64 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -18,7 +18,7 @@ include(g++-base.conf) MAKEFILE_GENERATOR = MINGW QMAKE_PLATFORM = win32 mingw CONFIG += debug_and_release debug_and_release_target precompile_header -DEFINES += UNICODE _UNICODE WIN32 +DEFINES += UNICODE _UNICODE WIN32 MINGW_HAS_SECURE_API=1 QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 # can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for # x86_64 platform similar to 'msvc-desktop.conf' toolchain, because, unlike for MSVC, diff --git a/qmake/Makefile.unix.win32 b/qmake/Makefile.unix.win32 index bfcad35357..48efd6f030 100644 --- a/qmake/Makefile.unix.win32 +++ b/qmake/Makefile.unix.win32 @@ -1,5 +1,5 @@ EXEEXT = .exe -EXTRA_CXXFLAGS = -DUNICODE +EXTRA_CXXFLAGS = -DUNICODE -DMINGW_HAS_SECURE_API=1 EXTRA_LFLAGS = -static -s -lole32 -luuid -ladvapi32 -lkernel32 -lnetapi32 QTOBJS = \ qfilesystemengine_win.o \ |