13 files changed, 38 insertions, 258 deletions
diff --git a/config.tests/unix/shivavg/shivavg.cpp b/config.tests/common/c++98default/c++98default.cpp
index 33fb7d226d..5edcf2d76c 100644
--- a/config.tests/unix/shivavg/shivavg.cpp
+++ b/config.tests/common/c++98default/c++98default.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the config.tests of the Qt Toolkit.
+** This file is part of the configuration of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -37,13 +37,8 @@
 **
 ****************************************************************************/
 
-#include <vg/openvg.h>
+#if __cplusplus >= 201103L
+#error "compiler uses c++11 or higher by default"
+#endif
 
-int main(int, char **)
-{
-    VGint i;
-    i = 2;
-    vgFlush();
-    vgDestroyContextSH();
-    return 0;
-}
+int main(int, char **) {}
diff --git a/config.tests/common/c++98default/c++98default.pro b/config.tests/common/c++98default/c++98default.pro
new file mode 100644
index 0000000000..97cf2d7b20
--- /dev/null
+++ b/config.tests/common/c++98default/c++98default.pro
@@ -0,0 +1,3 @@
+TEMPLATE = app
+CONFIG -= c++11 c++14 c++1z
+SOURCES = c++98default.cpp
diff --git a/config.tests/common/c++default/c++default.cpp b/config.tests/common/c++default/c++default.cpp
deleted file mode 100644
index 018963beb3..0000000000
--- a/config.tests/common/c++default/c++default.cpp
+++ /dev/null
@@ -1 +0,0 @@
-__cplusplus
diff --git a/config.tests/common/c++default/c++default.pro b/config.tests/common/c++default/c++default.pro
deleted file mode 100644
index 7e6bcefe69..0000000000
--- a/config.tests/common/c++default/c++default.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TEMPLATE = aux
-CONFIG -= qt c++11
-PREPROCESSOR_SOURCES += c++default.cpp
-
-preprocessor.commands = $(CXX) $(CXXFLAGS) $(INCPATH) -o $@ -E $<
-msvc:preprocessor.commands = $(CXX) $(CXXFLAGS) $(INCPATH) -E ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-preprocessor.output = ${QMAKE_FILE_BASE}.ii
-preprocessor.input = PREPROCESSOR_SOURCES
-preprocessor.variable_out = GENERATED_FILES
-QMAKE_EXTRA_COMPILERS += preprocessor
-
-all.target = all
-all.depends += c++default.ii
-QMAKE_EXTRA_TARGETS += all
diff --git a/config.tests/qpa/xcb-syslibs/xcb.cpp b/config.tests/qpa/xcb-syslibs/xcb.cpp
index 0e1bd76e6c..00d0da1b6c 100644
--- a/config.tests/qpa/xcb-syslibs/xcb.cpp
+++ b/config.tests/qpa/xcb-syslibs/xcb.cpp
@@ -57,8 +57,5 @@ int main(int, char **)
 
     xcb_connection_t *connection = xcb_connect("", &primaryScreen);
 
-    // This won't compile unless libxcb >= 1.5 which defines XCB_ATOM_PRIMARY.
-    int xcbAtomPrimary = XCB_ATOM_PRIMARY;
-
     return 0;
 }
diff --git a/config.tests/qpa/xcb-xkb/xcb-xkb.cpp b/config.tests/qpa/xcb-xkb/xcb-xkb.cpp
index 6a88944aee..9685649633 100644
--- a/config.tests/qpa/xcb-xkb/xcb-xkb.cpp
+++ b/config.tests/qpa/xcb-xkb/xcb-xkb.cpp
@@ -51,6 +51,9 @@ int main(int, char **)
 
     xcb_connection_t *connection = xcb_connect("", &primaryScreen);
 
+    // This takes more arguments in xcb-xkb < 1.10.
+    xcb_xkb_get_kbd_by_name_unchecked(NULL, 0, 0, 0, 0);
+
     // This won't compile unless libxcb >= 1.5 which defines XCB_ATOM_PRIMARY.
     int xcbAtomPrimary = XCB_ATOM_PRIMARY;
 
diff --git a/config.tests/qpa/xcb/xcb.cpp b/config.tests/qpa/xcb/xcb.cpp
index a5b419e695..efb4f0ca2e 100644
--- a/config.tests/qpa/xcb/xcb.cpp
+++ b/config.tests/qpa/xcb/xcb.cpp
@@ -43,5 +43,9 @@ int main(int, char **)
 {
     int primaryScreen = 0;
     xcb_connection_t *t = xcb_connect("", &primaryScreen);
+
+    // This won't compile unless libxcb >= 1.5 which defines XCB_ATOM_PRIMARY.
+    int xcbAtomPrimary = XCB_ATOM_PRIMARY;
+
     return 0;
 }
diff --git a/config.tests/unix/arch.test b/config.tests/unix/arch.test
deleted file mode 100755
index cfb47def4f..0000000000
--- a/config.tests/unix/arch.test
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-QMKSPEC=$1
-VERBOSE=$2
-SRCDIR=$3
-OUTDIR=$4
-RESULTFILE=$5
-TARGET=$6
-QMAKE=$7
-QTCONF=$8
-shift 8
-
-if [ "$TARGET" = "host" ]; then
-    VARPREFIX="CFG_HOST"
-    PROSUFFIX="_host"
-else
-    VARPREFIX="CFG"
-    PROSUFFIX=""
-fi
-
-LFLAGS="$SYSROOT_FLAG"
-CXXFLAGS="$SYSROOT_FLAG"
-
-while [ "$#" -gt 0 ]; do
-    PARAM=$1
-    case $PARAM in
-    -L*|-l*)
-        LFLAGS="$LFLAGS \"$PARAM\""
-        ;;
-    -I*)
-        INC=`echo $PARAM | sed -e 's/^-I//'`
-        INCLUDEPATH="$INCLUDEPATH \"$INC\""
-        ;;
-    -D*)
-        CXXFLAGS="$CXXFLAGS \"$PARAM\""
-        ;;
-    *)  ;;
-    esac
-    shift
-done
-
-# debuggery
-[ "$VERBOSE" = "yes" ] && echo "Determining architecture... ($*)"
-
-# build a test program but don't run it
-test -d "$OUTDIR/config.tests/arch" || mkdir -p "$OUTDIR/config.tests/arch"
-cd "$OUTDIR/config.tests/arch"
-[ -f Makefile ] && $MAKE distclean >/dev/null 2>&1
-OUTDIR=$OUTDIR "$QMAKE" -qtconf "$QTCONF" -nocache -spec "$QMKSPEC" "LIBS+=$LFLAGS" "QMAKE_CXXFLAGS+=$CXXFLAGS" "INCLUDEPATH+=$INCLUDEPATH" "CONFIG-=app_bundle" "$SRCDIR/config.tests/arch/arch$PROSUFFIX.pro" >/dev/null 2>&1 || echo "qmake is broken" >&2
-
-
-ARCH=""
-[ "$VERBOSE" = "yes" ] && $MAKE || $MAKE >/dev/null 2>&1
-
-if [ -f ./arch.exe ]; then
-    binary=./arch.exe
-elif [ -f ./arch ]; then
-    binary=./arch
-elif [ -f ./libarch.so ]; then
-    binary=./libarch.so
-else
-    [ "$VERBOSE" = "yes" ] && echo "Unable to determine architecture!"
-    exit 2
-fi
-
-if strings - $binary 2>/dev/null | \
-    awk -F: '/\=\=Qt\=magic\=Qt\=\= Architecture/ { print "'$VARPREFIX'_ARCH=\"" $2 "\"" }
-             /\=\=Qt\=magic\=Qt\=\= Sub-architecture/ { print "'$VARPREFIX'_CPUFEATURES=\"" $2 "\"" }' > "$RESULTFILE"
-then
-    [ "$VERBOSE" = "yes" ] && echo "    Found architecture in binary" && \
-        cat "$RESULTFILE"
-else
-    [ "$VERBOSE" = "yes" ] && echo "Unable to determine architecture!"
-    exit 2
-fi
-
-$MAKE distclean >/dev/null 2>&1
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
deleted file mode 100755
index f5db1847b8..0000000000
--- a/config.tests/unix/compile.test
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-SUCCESS=no
-QMKSPEC=$1
-XPLATFORM=`basename "$1"`
-QMAKE_CONFIG=$2
-VERBOSE=$3
-SRCDIR=$4
-OUTDIR=$5
-TEST=$6
-EXE=`basename "$6"`
-DESCRIPTION=$7
-QMAKE=$8
-QTCONF=$9
-shift 9
-LFLAGS="$SYSROOT_FLAG"
-INCLUDEPATH=""
-CFLAGS="$SYSROOT_FLAG"
-CXXFLAGS="$SYSROOT_FLAG"
-MAC_ARCH_CXXFLAGS=""
-MAC_ARCH_LFLAGS=""
-QMAKE_ARGS=
-while [ "$#" -gt 0 ]; do
-    PARAM=$1
-    case $PARAM in
-    -config)
-        QMAKE_CONFIG="$QMAKE_CONFIG $2"
-        shift
-        ;;
-    -framework)
-        LFLAGS="$LFLAGS -framework \"$2\""
-        shift
-        ;;
-    -arch)
-        MAC_ARCH_CFLAGS="$MAC_ARCH_CFLAGS -arch $2"
-        MAC_ARCH_CXXFLAGS="$MAC_ARCH_CXXFLAGS -arch $2"
-        MAC_ARCH_LFLAGS="$MAC_ARCH_LFLAGS -arch $2"
-        shift
-        ;;
-    -F*|-m*|-x*)
-        LFLAGS="$LFLAGS \"$PARAM\""
-        CFLAGS="$CFLAGS \"$PARAM\""
-        CXXFLAGS="$CXXFLAGS \"$PARAM\""
-        ;;
-    -L*|-l*|-pthread)
-        LFLAGS="$LFLAGS \"$PARAM\""
-	;;
-    -I*)
-        INC=`echo $PARAM | sed -e 's/^-I//'`
-        INCLUDEPATH="$INCLUDEPATH \"$INC\""
-        ;;
-    -f*|-D*)
-        CFLAGS="$CFLAGS \"$PARAM\""
-        CXXFLAGS="$CXXFLAGS \"$PARAM\""
-        ;;
-    -Qoption)
-	# Two-argument form for the Sun Compiler
-        CFLAGS="$CFLAGS $PARAM \"$2\""
-	CXXFLAGS="$CXXFLAGS $PARAM \"$2\""
-	shift
-	;;
-    *)
-        QMAKE_ARGS="$QMAKE_ARGS $PARAM"
-        ;;
-    esac
-    shift
-done
-
-test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
-
-cd "$OUTDIR/$TEST"
-
-test -r Makefile && $MAKE distclean >/dev/null 2>&1
-# Make sure output from possible previous tests is gone
-rm -f "$EXE" "${EXE}.exe"
-
-set -- \
-    "$QMAKE" \
-     -qtconf "$QTCONF" \
-     -nocache \
-     -spec "$QMKSPEC" \
-     "CONFIG+=$QMAKE_CONFIG" \
-     "CONFIG+=android_app" \
-     "CONFIG-=debug_and_release app_bundle lib_bundle" \
-     "LIBS+=$LFLAGS" \
-     "LIBS+=$MAC_ARCH_LFLAGS" \
-     "INCLUDEPATH*=$INCLUDEPATH" \
-     "QMAKE_CFLAGS*=$CFLAGS" \
-     "QMAKE_CFLAGS+=$MAC_ARCH_CFLAGS" \
-     "QMAKE_CXXFLAGS*=$CXXFLAGS" \
-     "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" \
-     $QMAKE_ARGS \
-     "$SRCDIR/$TEST/$EXE.pro" \
-     -o "$OUTDIR/$TEST/Makefile"
-if [ "$VERBOSE" = "yes" ]; then
-    echo
-    OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes
-else
-    OUTDIR=$OUTDIR "$@" >/dev/null 2>&1 && $MAKE >/dev/null 2>&1 && SUCCESS=yes
-fi
-
-# done
-if [ "$SUCCESS" != "yes" ]; then
-    [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled." || echo " no."
-    exit 1
-else
-    [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION enabled." || echo " yes."
-    exit 0
-fi
diff --git a/config.tests/unix/openvg/openvg.pro b/config.tests/unix/openvg/openvg.pro
deleted file mode 100644
index 4bbde99230..0000000000
--- a/config.tests/unix/openvg/openvg.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-SOURCES += openvg.cpp
-
-!isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG
-!isEmpty(QMAKE_LIBDIR_OPENVG): LIBS += -L$$QMAKE_LIBDIR_OPENVG
-!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG
-
-# Some OpenVG engines (e.g. ShivaVG) are implemented on top of OpenGL.
-# Add the extra includes and libraries for that case.
-openvg_on_opengl {
-    !isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
-    !isEmpty(QMAKE_LIBDIR_OPENGL): LIBS += -L$$QMAKE_LIBDIR_OPENGL
-    !isEmpty(QMAKE_LIBS_OPENGL): LIBS += $$QMAKE_LIBS_OPENGL
-}
-
-lower_case_includes {
-    DEFINES += QT_LOWER_CASE_VG_INCLUDES
-}
-
-CONFIG -= qt
diff --git a/config.tests/unix/openvg/openvg.cpp b/config.tests/unix/sctp/sctp.cpp
index a322db4824..40d7bb1bcb 100644
--- a/config.tests/unix/openvg/openvg.cpp
+++ b/config.tests/unix/sctp/sctp.cpp
@@ -1,9 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2016 Alex Trotsenko <alex1973tr@gmail.com>
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the documentation of the Qt Toolkit.
+** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -37,19 +37,24 @@
 **
 ****************************************************************************/
 
-// There is some variation in OpenVG engines as to what case
-// the VG includes use.  The Khronos reference implementation
-// for OpenVG 1.1 uses upper case, so we treat that as canonical.
-#if defined(QT_LOWER_CASE_VG_INCLUDES)
-#include <vg/openvg.h>
-#else
-#include <VG/openvg.h>
-#endif
+/* Sample program for configure to test for SCTP sockets support
+on target platforms. */
 
-int main(int, char **)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/sctp.h>
+
+int main()
 {
-    VGint i;
-    i = 2;
-    vgFlush();
+    int fd;
+    sctp_initmsg sctpInitMsg;
+    socklen_t sctpInitMsgSize = sizeof(sctpInitMsg);
+
+    fd = socket(PF_INET, SOCK_STREAM, IPPROTO_SCTP);
+    if (fd == -1 || getsockopt(fd, SOL_SCTP, SCTP_INITMSG, &sctpInitMsg,
+                               &sctpInitMsgSize) != 0)
+        return 1;
+
     return 0;
 }
diff --git a/config.tests/unix/sctp/sctp.pro b/config.tests/unix/sctp/sctp.pro
new file mode 100644
index 0000000000..edcc0a444a
--- /dev/null
+++ b/config.tests/unix/sctp/sctp.pro
@@ -0,0 +1,4 @@
+SOURCES = sctp.cpp
+CONFIG -= qt
+QT =
+LIBS += $$QMAKE_LIBS_NETWORK
diff --git a/config.tests/unix/shivavg/shivavg.pro b/config.tests/unix/shivavg/shivavg.pro
deleted file mode 100644
index 39d7bcc78a..0000000000
--- a/config.tests/unix/shivavg/shivavg.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-SOURCES += shivavg.cpp
-
-!isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG
-!isEmpty(QMAKE_LIBDIR_OPENVG): LIBS += -L$$QMAKE_LIBDIR_OPENVG
-!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG
-
-!isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
-!isEmpty(QMAKE_LIBDIR_OPENGL): LIBS += -L$$QMAKE_LIBDIR_OPENGL
-!isEmpty(QMAKE_LIBS_OPENGL): LIBS += $$QMAKE_LIBS_OPENGL
-
-CONFIG -= qt