Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	config.tests/unix/ptrsize.test
	configure
	src/corelib/global/qnamespace.h
	src/network/socket/qabstractsocket.cpp
	tests/auto/other/networkselftest/networkselftest.pro

Change-Id: Ic78abb4a34f9068567cea876861d4220f5a07672

5 files changed, 10 insertions, 58 deletions

diff --git a/config.tests/qpa/wayland-server/wayland-server.pro b/config.tests/qpa/wayland-server/wayland-server.pro
new file mode 100644
index 0000000000..c07740d20f
--- /dev/null
+++ b/config.tests/qpa/wayland-server/wayland-server.pro
@@ -0,0 +1,5 @@
+SOURCES = wl.cpp
+
+CONFIG -= qt
+CONFIG += link_pkgconfig
+PKGCONFIG += wayland-server
diff --git a/config.tests/unix/ptrsize/ptrsizetest.cpp b/config.tests/qpa/wayland-server/wl.cpp
index 826095d0e9..ba1756af57 100644
--- a/config.tests/unix/ptrsize/ptrsizetest.cpp
+++ b/config.tests/qpa/wayland-server/wl.cpp
@@ -31,23 +31,10 @@
 **
 ****************************************************************************/
 
-/* Sample program for configure to test pointer size on target
-platforms.
-*/
+#include <wayland-server.h>
 
-template<int>
-struct QPointerSizeTest
+int main(int, char **)
 {
-};
-
-template<>
-struct QPointerSizeTest<8>
-{
-    enum { PointerSize = 8 };
-};
-
-int main( int, char ** )
-{
-    return QPointerSizeTest<sizeof(void*)>::PointerSize;
+    wl_display_create();
+    return 0;
 }
-
diff --git a/config.tests/unix/harfbuzz/harfbuzz.cpp b/config.tests/unix/harfbuzz/harfbuzz.cpp
index bbaa9fc14d..1e6f7e70d6 100644
--- a/config.tests/unix/harfbuzz/harfbuzz.cpp
+++ b/config.tests/unix/harfbuzz/harfbuzz.cpp
@@ -33,7 +33,7 @@
 
 #include <harfbuzz/hb.h>
 
-#if !HB_VERSION_ATLEAST(0, 9, 31)
+#if !HB_VERSION_ATLEAST(0, 9, 42)
 #  error "This version of harfbuzz is too old."
 #endif
 
diff --git a/config.tests/unix/ptrsize.test b/config.tests/unix/ptrsize.test
deleted file mode 100755
index 5fede1d7ce..0000000000
--- a/config.tests/unix/ptrsize.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-QMKSPEC=$1
-VERBOSE=$2
-SRCDIR=$3
-OUTDIR=$4
-QMAKE=$5
-QTCONF=$6
-
-LFLAGS=$SYSROOT_FLAG
-CXXFLAGS=$SYSROOT_FLAG
-
-# debuggery
-[ "$VERBOSE" = "yes" ] && echo "Testing size of pointers ... ($*)"
-
-# build and run a test program
-test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize"
-"$QMAKE" -qtconf "$QTCONF" -nocache -spec "$QMKSPEC" "CONFIG-=app_bundle" "QMAKE_LFLAGS*=$LFLAGS" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
-cd "$OUTDIR/config.tests/unix/ptrsize"
-
-if [ "$VERBOSE" = "yes" ]; then
-  ($MAKE clean && $MAKE)
-else
-  ($MAKE clean && $MAKE) >/dev/null 2>&1
-fi
-RETVAL=$?
-
-if [ "$RETVAL" -ne 0 ]; then
-    PTRSIZE=4
-else
-    PTRSIZE=8
-fi
-
-
-# done
-[ "$VERBOSE" = "yes" ] && echo "Pointer size: $PTRSIZE"
-exit $PTRSIZE
diff --git a/config.tests/unix/ptrsize/ptrsizetest.pro b/config.tests/unix/ptrsize/ptrsizetest.pro
deleted file mode 100644
index a7ae38a5d9..0000000000
--- a/config.tests/unix/ptrsize/ptrsizetest.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = ptrsizetest.cpp
-CONFIG -= qt dylib
-CONFIG += debug console