Merge dev into 5.8

Change-Id: I41ee7b50534b01cf042bed8bb8824ba2e5026a29

.gitignore

@@ -116,6 +116,7 @@ bin/qt.conf
 bin/servicefw*
 bin/sfwlisten*
 configure.cache
+config.opt
 config.status
 config.summary
 config.log

bin/syncqt.pl

@@ -333,8 +333,8 @@ sub check_header {
     my ($lib, $header, $iheader, $public_header, $private_header) = @_;
     my $header_skip_qt_begin_namespace_test = 0;
 
+    return if ($ignore_for_include_check{$header});
     if ($public_header) {
-        return if ($ignore_for_include_check{$header});
         $header_skip_qt_begin_namespace_test = 1 if ($ignore_for_qt_begin_namespace_check{$header});
     }
 
@@ -879,6 +879,10 @@ loadSyncProfile(\$basedir, \$out_basedir);
 
 @modules_to_sync = keys(%modules) if($#modules_to_sync == -1);
 
+for my $p (keys %inject_headers) {
+    push @ignore_for_include_check, @{$inject_headers{$p}};
+}
+
 my %allmoduleheadersprivate = map { $_ => 1 } @allmoduleheadersprivate;
 %ignore_for_include_check = map { $_ => 1 } @ignore_for_include_check;
 %ignore_for_qt_begin_namespace_check = map { $_ => 1 } @ignore_for_qt_begin_namespace_check;

config.tests/common/libproxy/libproxy.pro

@@ -1,4 +1,3 @@
 SOURCES = libproxy.cpp
 CONFIG -= qt dylib
 mac:CONFIG -= app_bundle
-LIBS += -lproxy

config.tests/common/pch/header.h

@@ -0,0 +1 @@
+#define HEADER_H

config.tests/common/pch/pch.pro

@@ -0,0 +1,3 @@
+CONFIG += precompile_header
+PRECOMPILED_HEADER = header.h
+SOURCES = source.cpp

config.tests/common/pch/source.cpp

@@ -1,9 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the documentation of the Qt Toolkit.
+** This file is part of the configuration of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -36,9 +36,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <asm/hwcap.h>
 
-int main (int argc, char **argv)
+#ifndef HEADER_H
-{
+#error no go
-    return 0;
+#endif
-}
+
+int main() { return 0; }

config.tests/common/verifyspec/verifyspec.cpp

@@ -0,0 +1 @@
+int main(int, char **) {}

config.tests/common/verifyspec/verifyspec.pro

@@ -0,0 +1 @@
+SOURCES = verifyspec.cpp

config.tests/mac/corewlan/corewlan.pro

@@ -1,3 +1,2 @@
 OBJECTIVE_SOURCES = corewlantest.mm
-LIBS += -framework CoreWLAN -framework Foundation
 CONFIG -= qt

config.tests/qpa/direct2d/direct2d.pro

@@ -1,4 +1,3 @@
 SOURCES = direct2d.cpp
-LIBS += -ld2d1 -ldwrite -ld3d11
 CONFIG -= qt
 CONFIG += console

config.tests/qpa/egl-x11/egl-x11.pro

@@ -1,12 +1,3 @@
 SOURCES = egl-x11.cpp
 
-for(p, QMAKE_LIBDIR_EGL) {
-    LIBS += -L$$p
-}
-
-!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
-!isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
-
 CONFIG -= qt
-
-LIBS += -lxcb -lX11 -lX11-xcb

config.tests/qpa/egl/egl.pro

@@ -1,10 +1,3 @@
 SOURCES = egl.cpp
 
-for(p, QMAKE_LIBDIR_EGL) {
-    LIBS += -L$$p
-}
-
-!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
-!isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
-
 CONFIG -= qt

config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp

@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include <EGL/egl.h>
-#include <GLES2/gl2.h>
 #include <bcm_host.h>
 
 int main(int, char **)

config.tests/qpa/eglfs-brcm/eglfs-brcm.pro

@@ -1,11 +1,3 @@
 SOURCES = eglfs-brcm.cpp
 
 CONFIG -= qt
-
-INCLUDEPATH += $$QMAKE_INCDIR_EGL
-
-for(p, QMAKE_LIBDIR_EGL) {
-    LIBS += -L$$p
-}
-
-LIBS += -lEGL -lGLESv2 -lbcm_host

config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp

@@ -37,23 +37,13 @@
 **
 ****************************************************************************/
 
-// Test both EGLDevice/Output/Stream and DRM as we only use them in combination.
-//
-// Other KMS/DRM tests relying on pkgconfig for libdrm are not suitable since
-// some systems do not use pkgconfig for the graphics stuff.
-
-#include <stdlib.h>
-#include <stdint.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
-#include <xf86drm.h>
-#include <xf86drmMode.h>
 
 int main(int, char **)
 {
     EGLDeviceEXT device = 0;
     EGLStreamKHR stream = 0;
     EGLOutputLayerEXT layer = 0;
-    drmModeCrtcPtr currentMode = drmModeGetCrtc(0, 0);
     return EGL_DRM_CRTC_EXT;
 }

config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro

@@ -1,15 +1,3 @@
 SOURCES = eglfs-egldevice.cpp
 
-for(p, QMAKE_LIBDIR_EGL) {
-    LIBS += -L$$p
-}
-
-INCLUDEPATH += $$QMAKE_INCDIR_EGL
-LIBS += $$QMAKE_LIBS_EGL
-CONFIG += link_pkgconfig
-!contains(QT_CONFIG, no-pkg-config) {
-    PKGCONFIG += libdrm
-} else {
-    LIBS += -ldrm
-}
 CONFIG -= qt

config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro

@@ -1,5 +1,3 @@
 SOURCES = eglfs-mali-2.cpp
 
 CONFIG -= qt
-
-LIBS += -lEGL -lGLESv2

config.tests/qpa/eglfs-mali/eglfs-mali.pro

@@ -1,5 +1,3 @@
 SOURCES = eglfs-mali.cpp
 
 CONFIG -= qt
-
-LIBS += -lEGL -lGLESv2

config.tests/qpa/eglfs-viv/eglfs-viv.cpp

@@ -39,7 +39,6 @@
 
 #include <EGL/egl.h>
 #include <EGL/eglvivante.h>
-#include <GLES2/gl2.h>
 
 int main(int, char **)
 {

config.tests/qpa/eglfs-viv/eglfs-viv.pro

@@ -5,12 +5,3 @@ integrity {
   DEFINES += LINUX=1 EGL_API_FB=1
 }
 CONFIG -= qt
-
-LIBS += -lEGL -lGLESv2 -lGAL
-
-for(p, QMAKE_LIBDIR_OPENGL_ES2) {
-    exists($$p):LIBS += -L$$p
-}
-
-!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
-!isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL

config.tests/qpa/gbm/gbm.pro

@@ -1,4 +1,2 @@
 SOURCES = gbm.cpp
-CONFIG += link_pkgconfig
-PKGCONFIG += gbm
 CONFIG -= qt

config.tests/qpa/kms/kms.pro

@@ -1,4 +1,2 @@
 SOURCES = kms.cpp
-CONFIG += link_pkgconfig
-PKGCONFIG += libdrm
 CONFIG -= qt

config.tests/qpa/mirclient/mirclient.pro

@@ -1,4 +1,2 @@
 SOURCES = mirclient.cpp
-CONFIG += link_pkgconfig
-PKGCONFIG += egl mirclient ubuntu-platform-api
 CONFIG -= qt

config.tests/qpa/wayland-server/wayland-server.pro

@@ -1,5 +1,3 @@
 SOURCES = wl.cpp
 
 CONFIG -= qt
-CONFIG += link_pkgconfig
-PKGCONFIG += wayland-server

config.tests/qpa/xcb-glx/xcb-glx.pro

@@ -1,5 +1,2 @@
 SOURCES = xcb-glx.cpp
 CONFIG -= qt
-
-LIBS += -lxcb -lxcb-glx
-

config.tests/qpa/xcb-render/xcb-render.pro

@@ -1,5 +1,2 @@
 SOURCES = xcb-render.cpp
 CONFIG -= qt
-
-LIBS += -lxcb -lxcb-render -lxcb-render-util
-

config.tests/qpa/xcb-syslibs/xcb-syslibs.pro

@@ -1,5 +1,2 @@
 SOURCES = xcb.cpp
 CONFIG -= qt
-
-LIBS += -lxcb -lxcb-image -lxcb-keysyms -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-randr
-

config.tests/qpa/xcb-xkb/xcb-xkb.pro

@@ -1,5 +1,2 @@
 SOURCES = xcb-xkb.cpp
 CONFIG -= qt
-
-LIBS += -lxcb -lxcb-xkb
-

config.tests/qpa/xcb-xlib/xcb-xlib.pro

@@ -1,5 +1,2 @@
 SOURCES = xcb-xlib.cpp
 CONFIG -= qt
-
-LIBS += -lxcb -lX11 -lX11-xcb
-

config.tests/qpa/xcb/xcb.pro

@@ -1,5 +1,2 @@
 SOURCES = xcb.cpp
 CONFIG -= qt
-
-LIBS += -lxcb
-

config.tests/unix/alsa/alsa.pro

@@ -1,3 +1,2 @@
 SOURCES = alsatest.cpp
-LIBS+=-lasound
 CONFIG -= qt dylib

config.tests/unix/bsymbolic_functions.test

@@ -1,31 +0,0 @@
-#!/bin/sh
-
-BSYMBOLIC_FUNCTIONS_SUPPORT=no
-COMPILER=$1
-VERBOSE=$2
-
-
-cat >>bsymbolic_functions.c << EOF
-#if !(defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64))
-#error "Symbolic function binding on this architecture may be broken, disabling it (see QTBUG-36129)."
-#endif
-
-int main() { return 0; }
-EOF
-
-if [ "$VERBOSE" = "yes" ] ; then
-    echo $COMPILER $SYSROOT_FLAG -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c
-    $COMPILER $SYSROOT_FLAG -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
-else
-    $COMPILER $SYSROOT_FLAG -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
-fi
-rm -f bsymbolic_functions.c libtest.so
-
-# done
-if [ "$BSYMBOLIC_FUNCTIONS_SUPPORT" != "yes" ]; then
-    [ "$VERBOSE" = "yes" ] && echo "Symbolic function binding disabled."
-    exit 0
-else
-    [ "$VERBOSE" = "yes" ] && echo "Symbolic function binding enabled."
-    exit 1
-fi

config.tests/unix/cups/cups.pro

@@ -1,3 +1,2 @@
 SOURCES = cups.cpp
 CONFIG -= qt dylib
-LIBS += -lcups

config.tests/unix/db2/db2.pro

@@ -1,3 +1,2 @@
 SOURCES = db2.cpp
 CONFIG -= qt dylib
-LIBS += -ldb2

config.tests/unix/dbus/dbus.pro

@@ -1,2 +1,8 @@
 SOURCES = dbus.cpp
 CONFIG -= qt
+
+CONFIG += build_all
+CONFIG(debug, debug|release): \
+    LIBS += $$LIBS_DEBUG
+else: \
+    LIBS += $$LIBS_RELEASE

config.tests/unix/doubleconversion/doubleconversion.pro

@@ -1,4 +1,3 @@
 SOURCES = doubleconversion.cpp
 CONFIG -= qt
 CONFIG += console
-LIBS += -ldouble-conversion

config.tests/unix/fontconfig/fontconfig.pro

@@ -1,4 +1,3 @@
 SOURCES = fontconfig.cpp
 CONFIG -= qt
-LIBS += -lfreetype -lfontconfig
 include(../../unix/freetype/freetype.pri)

config.tests/unix/freetype/freetype.pro

@@ -1,4 +1,3 @@
 SOURCES = freetype.cpp
 CONFIG -= qt
-LIBS += -lfreetype
 include(freetype.pri)

config.tests/unix/fvisibility.test

@@ -1,74 +0,0 @@
-#!/bin/sh
-
-FVISIBILITY_SUPPORT=no
-COMPILER=$1
-VERBOSE=$2
-
-CMDLINE=
-
-
-RunCompileTest() {
-    cat >>fvisibility.c << EOF
-#if defined(__GNUC__)
-#   if (__GNUC__ < 4)
-#      error "GCC3 with backported visibility patch is known to miscompile Qt"
-#   endif
-__attribute((visibility("default"))) void blah();
-#elif defined(__SUNPRO_CC)
-#   if (__SUNPRO_CC < 0x0550)
-#      error "SunStudio 8 or later is required for ELF visibility"
-#   endif
-__global void blah();
-#else
-#   error "GCC4+ or SunStudio 8+ are required to support ELF visibility"
-#endif
-EOF
-
-    if [ "$VERBOSE" = "yes" ] ; then
-        echo $COMPILER -c $CMDLINE fvisibility.c
-        $COMPILER -c $CMDLINE fvisibility.c && FVISIBILITY_SUPPORT=yes
-    else
-        $COMPILER -c $CMDLINE fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
-    fi
-    rm -f fvisibility.c fvisibility.o
-}
-
-
-case "$COMPILER" in
-*g++*|*c++*|*qcc*)
-    CMDLINE="-fvisibility=hidden"
-    RunCompileTest
-   ;;
-
-aCC*)
-    ;;
-
-icpc)
-    ICPC_VERSION=`icpc -dumpversion`
-    case "$ICPC_VERSION" in
-    8.*|9.*|10.0)
-        # 8.x, 9.x, and 10.0 don't support symbol visibility
-        ;;
-    *)
-        # the compile test works for the intel compiler because it mimics gcc's behavior
-        CMDLINE="-fvisibility=hidden"
-        RunCompileTest
-        ;;
-    esac
-    ;;
-
-CC)
-   # This should be SunStudio.  If not, it'll get caught.
-   CMDLINE="-xldscope=hidden"
-   RunCompileTest
-   ;;
-esac
-
-# done
-if [ "$FVISIBILITY_SUPPORT" != "yes" ]; then
-    [ "$VERBOSE" = "yes" ] && echo "Symbol visibility control disabled."
-    exit 0
-else
-    [ "$VERBOSE" = "yes" ] && echo "Symbol visibility control enabled."
-    exit 1
-fi

config.tests/unix/getaddrinfo/getaddrinfo.pro

@@ -1,3 +1,2 @@
 SOURCES = getaddrinfotest.cpp
 CONFIG -= qt dylib
-LIBS += $$QMAKE_LIBS_NETWORK

config.tests/unix/getifaddrs/getifaddrs.pro

@@ -1,4 +1,3 @@
 SOURCES = getifaddrs.cpp
 CONFIG -= qt
 QT =
-LIBS += $$QMAKE_LIBS_NETWORK

config.tests/unix/gnu-libiconv/gnu-libiconv.pro

@@ -1,3 +1,2 @@
 SOURCES = gnu-libiconv.cpp
 CONFIG -= qt dylib
-LIBS += -liconv

config.tests/unix/gstreamer/gstreamer.pro

@@ -1,22 +1,4 @@
 SOURCES += gstreamer.cpp
 
-CONFIG += link_pkgconfig
-
-gst-0.10 {
-    PKGCONFIG_PRIVATE += \
-        gstreamer-0.10 \
-        gstreamer-base-0.10 \
-        gstreamer-audio-0.10 \
-        gstreamer-video-0.10 \
-        gstreamer-pbutils-0.10
-} else:gst-1.0 {
-    PKGCONFIG_PRIVATE += \
-        gstreamer-1.0 \
-        gstreamer-base-1.0 \
-        gstreamer-audio-1.0 \
-        gstreamer-video-1.0 \
-        gstreamer-pbutils-1.0
-}
-
 CONFIG -= qt
 

config.tests/unix/harfbuzz/harfbuzz.pro

@@ -1,3 +1,2 @@
 SOURCES = harfbuzz.cpp
 CONFIG -= qt dylib
-LIBS += -lharfbuzz

config.tests/unix/ibase/ibase.pro

@@ -1,3 +1,2 @@
 SOURCES = ibase.cpp
 CONFIG -= qt dylib
-LIBS += -lgds

config.tests/unix/icu/icu.pro

@@ -2,4 +2,8 @@ SOURCES = icu.cpp
 CONFIG += console
 CONFIG -= qt dylib
 
-include($$PWD/../../../src/3rdparty/icu_dependency.pri)
+CONFIG += build_all
+CONFIG(debug, debug|release): \
+    LIBS += $$LIBS_DEBUG
+else: \
+    LIBS += $$LIBS_RELEASE

config.tests/unix/iodbc/iodbc.cpp

@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <sql.h>
-#include <sqlext.h>
-
-int main(int, char **)
-{
-    return 0;
-}

config.tests/unix/iodbc/iodbc.pro

@@ -1,3 +0,0 @@
-SOURCES = iodbc.cpp
-CONFIG -= qt dylib
-LIBS += -liodbc

config.tests/unix/ipv6ifname/ipv6ifname.pro

@@ -1,4 +1,3 @@
 SOURCES = ipv6ifname.cpp
 CONFIG -= qt
 QT =
-LIBS += $$QMAKE_LIBS_NETWORK

config.tests/unix/javascriptcore-jit/javascriptcore-jit.pro

@@ -1,2 +0,0 @@
-SOURCES = hwcap_test.cpp
-CONFIG -= qt dylib

config.tests/unix/journald/journald.pro

@@ -1,10 +1,3 @@
 SOURCES = journald.c
 
-CONFIG += link_pkgconfig
-
-packagesExist(libsystemd): \
-    PKGCONFIG_PRIVATE += libsystemd
-else: \
-    PKGCONFIG_PRIVATE += libsystemd-journal
-
 CONFIG -= qt

config.tests/unix/lgmon/lgmon.pro

@@ -1,3 +1,2 @@
 SOURCES = lgmon.cpp
 CONFIG -= qt
-LIBS += -llgmon

config.tests/unix/libdl/libdl.pro

@@ -1,2 +0,0 @@
-include(../dlopen/dlopen.pro)
-LIBS += -ldl

config.tests/unix/libinput/libinput.pro

@@ -1,4 +1,2 @@
 SOURCES = libinput.cpp
 CONFIG -= qt
-LIBS += $$QMAKE_LIBS_LIBINPUT
-INCLUDEPATH += $$QMAKE_INCDIR_LIBINPUT

config.tests/unix/libjpeg/libjpeg.pro

@@ -1,3 +1,2 @@
 SOURCES = libjpeg.cpp
 CONFIG -= qt dylib
-LIBS += -ljpeg

config.tests/unix/libpng/libpng.pro

@@ -1,8 +1,2 @@
 SOURCES = libpng.cpp
 CONFIG -= qt dylib
-!contains(QT_CONFIG, no-pkg-config) {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += libpng
-} else {
-    LIBS += -lpng
-}

config.tests/unix/libudev/libudev.pro

@@ -1,4 +1,2 @@
 SOURCES = libudev.cpp
 CONFIG -= qt
-LIBS += $$QMAKE_LIBS_LIBUDEV
-INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV

config.tests/unix/mtdev/mtdev.pro

@@ -1,6 +1,3 @@
 SOURCES = mtdev.cpp
 
-CONFIG += link_pkgconfig
-PKGCONFIG_PRIVATE += mtdev
-
 CONFIG -= qt

config.tests/unix/mysql/mysql.cpp

@@ -36,6 +36,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(WIN64) || defined(_WIN64) || defined(__WIN64__)
+#include <windows.h>
+#endif
 
 #include "mysql.h"
 

config.tests/unix/mysql/mysql.pro

@@ -1,3 +1,2 @@
 SOURCES = mysql.cpp
 CONFIG -= qt dylib
-LIBS += -lmysqlclient

config.tests/unix/mysql_r/mysql_r.pro

@@ -1,3 +0,0 @@
-SOURCES = ../mysql/mysql.cpp
-CONFIG -= qt dylib
-LIBS += -lmysqlclient_r

config.tests/unix/oci/oci.pro

@@ -1,3 +1,2 @@
 SOURCES = oci.cpp
 CONFIG -= qt dylib
-LIBS += -lclntsh

config.tests/unix/odbc/odbc.cpp

@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#ifdef __MINGW32__
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(WIN64) || defined(_WIN64) || defined(__WIN64__)
 #include <windows.h>
 #endif
 #include <sql.h>
@@ -45,5 +45,7 @@
 
 int main(int, char **)
 {
+    SQLHANDLE env;
+    SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &env);
     return 0;
 }

config.tests/unix/odbc/odbc.pro

@@ -1,4 +1,2 @@
 SOURCES = odbc.cpp
 CONFIG -= qt dylib
-mingw:LIBS += -lodbc32
-else:LIBS += -lodbc

config.tests/unix/opengldesktop/opengldesktop.pro

@@ -1,11 +1,5 @@
 SOURCES = opengldesktop.cpp
-INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
-
-for(p, QMAKE_LIBDIR_OPENGL) {
-    exists($$p):LIBS += -L$$p
-}
 
 CONFIG -= qt
-LIBS += $$QMAKE_LIBS_OPENGL
 
 mac:DEFINES += Q_OS_MAC

config.tests/unix/opengles2/opengles2.pro

@@ -1,12 +1,7 @@
 SOURCES = opengles2.cpp
-INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
-
-for(p, QMAKE_LIBDIR_OPENGL_ES2) {
-    LIBS += -L$$p
-}
 
 CONFIG -= qt
-LIBS += $$QMAKE_LIBS_OPENGL_ES2
+
 mac {
     DEFINES += BUILD_ON_MAC
 }

config.tests/unix/opengles3/opengles3.pro

@@ -3,14 +3,9 @@
 # the library.
 
 SOURCES = opengles3.cpp
-INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
-
-for(p, QMAKE_LIBDIR_OPENGL_ES2) {
-    LIBS += -L$$p
-}
 
 CONFIG -= qt
-LIBS += $$QMAKE_LIBS_OPENGL_ES2
+
 mac {
     DEFINES += BUILD_ON_MAC
 }

config.tests/unix/opengles31/opengles31.pro

@@ -3,11 +3,5 @@
 # the library.
 
 SOURCES = opengles31.cpp
-INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
-
-for(p, QMAKE_LIBDIR_OPENGL_ES2) {
-    LIBS += -L$$p
-}
 
 CONFIG -= qt
-LIBS += $$QMAKE_LIBS_OPENGL_ES2

config.tests/unix/pcre/pcre.pro

@@ -1,3 +1,2 @@
 SOURCES = pcre.cpp
 CONFIG -= qt dylib
-LIBS += -lpcre16

config.tests/unix/pps/pps.pro

@@ -1,3 +1,2 @@
 SOURCES = pps.cpp
 CONFIG -= qt
-LIBS += -lpps

config.tests/unix/precomp.test

@@ -1,54 +0,0 @@
-#!/bin/sh
-
-PRECOMP_SUPPORT=no
-COMPILER=$1
-VERBOSE=$2
-
-case "$COMPILER" in
-*icpc)
-    cat >header.h <<EOF
-#define HEADER_H
-
-EOF
-    >header.cpp
-    cat >source.cpp <<EOF
-#ifndef HEADER_H
-#error no go
-#endif
-
-EOF
-
-    rm -f header.pchi
-    $COMPILER -pch-create header.pchi -include header.h -c header.cpp -o header.o >/dev/null 2>&1 \
-        && $COMPILER -pch-use header.pchi -include header.h -c source.cpp -o source.o >/dev/null 2>&1 \
-        && PRECOMP_SUPPORT=yes
-
-    rm -f header.h header.cpp source.cpp
-    rm -f header.pchi header.o source.o
-    ;;
-
-*g++*|c++|*qcc*)
-    case `"$COMPILER" -dumpversion 2>/dev/null` in
-    3.*)
-        ;;
-    *)
-
-        >precomp_header.h
-        if $COMPILER -x c-header precomp_header.h >/dev/null 2>&1; then
-           $COMPILER -x c++-header precomp_header.h && PRECOMP_SUPPORT=yes
-        fi
-        rm -f precomp_header.h precomp_header.h.gch
-        ;;
-    esac
-    ;;
-esac
-
-
-# done
-if [ "$PRECOMP_SUPPORT" != "yes" ]; then
-    [ "$VERBOSE" = "yes" ] && echo "Precompiled-headers support disabled."
-    exit 0
-else
-    [ "$VERBOSE" = "yes" ] && echo "Precompiled-headers support enabled."
-    exit 1
-fi

config.tests/unix/psql/psql.pro

@@ -1,3 +1,2 @@
 SOURCES = psql.cpp
 CONFIG -= qt dylib
-LIBS *= -lpq

config.tests/unix/pulseaudio/pulseaudio.pro

@@ -1,3 +1,2 @@
 SOURCES = pulseaudio.cpp
 CONFIG -= qt
-LIBS +=

config.tests/unix/qqnx_imf/qqnx_imf.pro

@@ -1,3 +1,2 @@
 SOURCES = qqnx_imf.cpp
 CONFIG -= qt
-LIBS += -linput_client

config.tests/unix/reduce_exports/fvisibility.c

@@ -1,9 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company.
 ** 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,25 +37,16 @@
 **
 ****************************************************************************/
 
-#ifdef Q_OS_HPUX
+#if defined(__GNUC__)
-#error "MITSHM not supported on HP-UX."
+#   if (__GNUC__ < 4)
+#      error "GCC3 with backported visibility patch is known to miscompile Qt"
+#   endif
+__attribute((visibility("default"))) void blah();
+#elif defined(__SUNPRO_CC)
+#   if (__SUNPRO_CC < 0x0550)
+#      error "SunStudio 8 or later is required for ELF visibility"
+#   endif
+__global void blah();
 #else
-#include <X11/Xlib.h>
+#   error "GCC4+ or SunStudio 8+ are required to support ELF visibility"
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <X11/extensions/XShm.h>
-
-int main(int, char **)
-{
-    Display *dpy = 0;
-    int minor;
-    int major;
-    int pixmaps;
-    if (dpy && XShmQueryVersion(dpy, &major, &minor, &pixmaps)) {
-        minor = 0;
-        major = 0;
-        pixmaps = 0;
-    }
-    return 0;
-}
 #endif

config.tests/unix/reduce_exports/reduce_exports.pro

@@ -0,0 +1,5 @@
+TEMPLATE = lib
+CONFIG += dll hide_symbols
+SOURCES = fvisibility.c
+
+isEmpty(QMAKE_CFLAGS_HIDESYMS): error("Nope")

config.tests/unix/reduce_relocs/bsymbolic_functions.c

@@ -1,9 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company.
 ** 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,17 +37,8 @@
 **
 ****************************************************************************/
 
-#include <X11/Xlib.h>
+#if !(defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64))
-#include <X11/extensions/Xfixes.h>
+#  error Symbolic function binding on this architecture may be broken, disabling it (see QTBUG-36129).
-
-#if XFIXES_MAJOR < 2
-#  error "Required Xfixes version 2.0 not found."
 #endif
 
-int main(int, char **)
+int main() { return 0; }
-{
-    XFixesSelectionNotifyEvent event;
-    event.type = 0;
-    return 0;
-}
-

config.tests/unix/reduce_relocs/reduce_relocs.pro

@@ -0,0 +1,5 @@
+TEMPLATE = lib
+CONFIG += dll bsymbolic_functions
+SOURCES = bsymbolic_functions.c
+
+isEmpty(QMAKE_LFLAGS_BSYMBOLIC_FUNC): error("Nope")

config.tests/unix/sctp/sctp.pro

@@ -1,4 +1,3 @@
 SOURCES = sctp.cpp
 CONFIG -= qt
 QT =
-LIBS += $$QMAKE_LIBS_NETWORK

config.tests/unix/slog2/slog2.pro

@@ -1,3 +1,2 @@
 SOURCES = slog2.cpp
 CONFIG -= qt
-LIBS += -lslog2

config.tests/unix/sqlite2/sqlite2.pro

@@ -1,3 +1,2 @@
 SOURCES = sqlite2.cpp
 CONFIG -= qt dylib
-LIBS += -lsqlite

config.tests/unix/stdint/stdint.pro

@@ -1,3 +0,0 @@
-SOURCES = main.cpp
-CONFIG -= x11 qt
-

config.tests/unix/tds/tds.pro

@@ -1,3 +1,2 @@
 SOURCES = tds.cpp
 CONFIG -= qt dylib
-LIBS += -lsybdb

config.tests/unix/tslib/tslib.pro

@@ -1,3 +1,2 @@
 SOURCES = tslib.cpp
 CONFIG -= qt 
-LIBS += -lts

config.tests/unix/zlib/zlib.pro

@@ -1,3 +1,2 @@
 SOURCES = zlib.cpp
 CONFIG -= qt dylib
-LIBS += -lz

config.tests/win/directwrite/directwrite.pro

@@ -1,4 +1,3 @@
 SOURCES = directwrite.cpp
-LIBS += -ldwrite
 CONFIG -= qt
 CONFIG += console

config.tests/win/directwrite2/directwrite2.pro

@@ -1,4 +1,3 @@
 SOURCES = directwrite2.cpp
-LIBS += -ldwrite
 CONFIG -= qt
 CONFIG += console

config.tests/x11/glxfbconfig/glxfbconfig.cpp

@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** 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.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <GL/gl.h>
-#include <GL/glx.h>
-
-int main(int, char **)
-{
-    GLXFBConfig config;
-    config = 0;
-
-    return 0;
-}

config.tests/x11/glxfbconfig/glxfbconfig.pro

@@ -1,10 +0,0 @@
-SOURCES = glxfbconfig.cpp
-CONFIG += x11
-INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
-
-for(p, QMAKE_LIBDIR_OPENGL) {
-    exists($$p):LIBS += -L$$p
-}
-
-CONFIG -= qt
-LIBS += -lGL

config.tests/x11/mitshm/mitshm.pro

@@ -1,5 +0,0 @@
-SOURCES = mitshm.cpp
-CONFIG += x11
-CONFIG -= qt
-LIBS += -lXext
-hpux*:DEFINES+=Q_OS_HPUX

config.tests/x11/notype.test

@@ -1,49 +0,0 @@
-#!/bin/sh
-
-QMKSPEC=$1
-XPLATFORM=`basename $1`
-VERBOSE=$2
-SRCDIR=$3
-OUTDIR=$4
-
-# debuggery
-[ "$VERBOSE" = "yes" ] && echo "Detecting broken X11 headers... ($*)"
-
-# Detect broken X11 headers when using GCC 2.95 or later
-#   Xsun on Solaris 2.5.1:
-#   	Patches are available for Solaris 2.6, 7, and 8 but
-#   	not for Solaris 2.5.1.
-#   HP-UX:
-#   	Patches are available for HP-UX 10.20, 11.00, and 11.11.
-#   AIX 4.3.3 and AIX 5.1:
-#   	Headers are clearly broken on all AIX versions, and we
-#   	don't know of any patches. The strange thing is that we
-#   	did not get any reports about this issue until very
-#   	recently, long after gcc 3.0.x was released. It seems to
-#   	work for us with gcc 2.95.2.
-NOTYPE=no
-
-if [ $XPLATFORM = "solaris-g++" -o $XPLATFORM = "hpux-g++" -o $XPLATFORM = "aix-g++" -o $XPLATFORM = "aix-g++-64" ]; then
-    NOTYPE=yes
-
-    test -d "$OUTDIR/config.tests/x11/notype" || mkdir -p "$OUTDIR/config.tests/x11/notype"
-    "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1
-    cd "$OUTDIR/config.tests/x11/notype"
-
-    if [ "$VERBOSE" = "yes" ]; then
-	$MAKE
-    else
-	$MAKE >/dev/null 2>&1
-    fi
-
-    [ -x notypetest ] && NOTYPE=no
-fi
-
-# done
-if [ "$NOTYPE" = "yes" ]; then
-    [ "$VERBOSE" = "yes" ] && echo "Broken X11 headers detected."
-    exit 0
-else
-    [ "$VERBOSE" = "yes" ] && echo "X11 headers look good."
-    exit 1
-fi

config.tests/x11/notype/notypetest.pro

@@ -1,5 +0,0 @@
-TEMPLATE=app
-TARGET=notypetest
-CONFIG-=qt
-CONFIG+=x11
-SOURCES=notypetest.cpp

config.tests/x11/opengl/opengl.cpp

@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** 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.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <GL/gl.h>
-
-int main(int, char **)
-{
-    GLuint x;
-    x = 0;
-    return 0;
-}

config.tests/x11/opengl/opengl.pro

@@ -1,11 +0,0 @@
-SOURCES = opengl.cpp
-CONFIG += x11
-INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
-
-for(p, QMAKE_LIBDIR_OPENGL) {
-    exists($$p):LIBS += -L$$p
-}
-
-CONFIG -= qt
-mingw:LIBS += -lopengl32
-else:LIBS += -lGL

config.tests/x11/xcursor/xcursor.pro

@@ -1,4 +0,0 @@
-SOURCES = xcursor.cpp
-CONFIG += x11
-CONFIG -= qt
-LIBS += -lXcursor

config.tests/x11/xfixes/xfixes.pro

@@ -1,3 +0,0 @@
-CONFIG += x11
-CONFIG -= qt
-SOURCES = xfixes.cpp

config.tests/x11/xinput2/xinput2.pro

@@ -1,4 +1,3 @@
 CONFIG += x11
 CONFIG -= qt
-LIBS += -lXi
 SOURCES = xinput2.cpp

config.tests/x11/xkb/xkb.pro

@@ -1,3 +0,0 @@
-SOURCES = xkb.cpp
-CONFIG += x11
-CONFIG -= qt

config.tests/x11/xrandr/xrandr.cpp

@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** 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.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <X11/Xlib.h>
-#include <X11/extensions/Xrandr.h>
-
-#if RANDR_MAJOR != 1 || RANDR_MINOR < 1
-#  error "Requried Xrandr version 1.1 not found."
-#endif
-
-int main(int, char **)
-{
-    XRRScreenSize *size;
-    size = 0;
-    return 0;
-}

config.tests/x11/xrandr/xrandr.pro

@@ -1,4 +0,0 @@
-SOURCES = xrandr.cpp
-CONFIG += x11
-CONFIG -= qt
-LIBS += -lXrender -lXrandr