diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:45:40 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:54:01 +0200 |
| commit | 77da617dc8e378a631ee8c15b1b414f16b87f147 (patch) | |
| tree | 563f4f8e64e416774ea2b1599b896b589385168c /src/3rdparty | |
| parent | c17134e2db4d364855aa78a0d3c47cb9ef964dd9 (diff) | |
| parent | 01f3530650f9f6f4c08520263a3c62281d81e3fc (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
doc/global/qt-cpp-defines.qdocconf
src/3rdparty/forkfd/forkfd.c
src/corelib/codecs/qtextcodec.cpp
src/corelib/kernel/qmetatype.cpp
src/corelib/tools/qset.qdoc
src/gui/accessible/qaccessible.cpp
src/gui/image/qpixmapcache.cpp
src/opengl/qgl.cpp
src/tools/qdoc/generator.cpp
src/widgets/kernel/qwidget.cpp
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/forkfd/forkfd.c | 10 | ||||
| -rw-r--r-- | src/3rdparty/md5/md5.cpp | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/3rdparty/forkfd/forkfd.c b/src/3rdparty/forkfd/forkfd.c index 39eeb6a202..e942db2717 100644 --- a/src/3rdparty/forkfd/forkfd.c +++ b/src/3rdparty/forkfd/forkfd.c @@ -44,11 +44,13 @@ #ifdef __linux__ # define HAVE_WAIT4 1 -# if (defined(__GLIBC__) && (__GLIBC__ << 16) + __GLIBC_MINOR__ >= 0x207) || defined(__BIONIC__) +# if defined(__BIONIC__) || (defined(__GLIBC__) && (__GLIBC__ << 8) + __GLIBC_MINOR__ >= 0x207 && \ + (!defined(__UCLIBC__) || ((__UCLIBC_MAJOR__ << 16) + (__UCLIBC_MINOR__ << 8) + __UCLIBC_SUBLEVEL__ > 0x921))) # include <sys/eventfd.h> # define HAVE_EVENTFD 1 # endif -# if (defined(__GLIBC__) && (__GLIBC__ << 16) + __GLIBC_MINOR__ >= 0x209) || defined(__BIONIC__) +# if defined(__BIONIC__) || (defined(__GLIBC__) && (__GLIBC__ << 8) + __GLIBC_MINOR__ >= 0x209 && \ + (!defined(__UCLIBC__) || ((__UCLIBC_MAJOR__ << 16) + (__UCLIBC_MINOR__ << 8) + __UCLIBC_SUBLEVEL__ > 0x921))) # define HAVE_PIPE2 1 # endif #endif @@ -56,6 +58,10 @@ #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500 # define HAVE_WAITID 1 #endif + +#if defined(__FreeBSD__) +# define HAVE_PIPE2 1 +#endif #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || \ defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) # define HAVE_WAIT4 1 diff --git a/src/3rdparty/md5/md5.cpp b/src/3rdparty/md5/md5.cpp index cc69b56213..f9e04a93e3 100644 --- a/src/3rdparty/md5/md5.cpp +++ b/src/3rdparty/md5/md5.cpp @@ -36,7 +36,7 @@ static void byteSwap(UWORD32 *buf, unsigned words) { const quint32 byteOrderTest = 0x1; - if (((char *)&byteOrderTest)[0] == 0) { + if (((const char *)&byteOrderTest)[0] == 0) { md5byte *p = (md5byte *)buf; do { |