configure: Add a feature to write tests in the .json file

We're adding a lot of unnecessary files that end up later as cargo-cult,
for at most a handful of lines. So instead move the testcases directly
into the .json file.

The following sources were not inlined, because multiple tests share
them, and the inlining infra does not support that (yet):
- avx512
- openssl
- gnu-libiconv/sun-libiconv (there is also a command line option to
  select the exact variant, which makes it hard/impossible to properly
  coalesce the library sources)

The following sources were not inlined because of "complications":
- verifyspec contains a lengthy function in the project file
- stl contains lots of code in the source file
- xlocalescanprint includes a private header from the source tree via a
  relative path, which we can't do, as the test's physical location is
  variable.
- corewlan uses objective c++, which the inline system doesn't support

reduce_relocs and reduce_exports now create libraries with main(), which
is weird enough, but doesn't hurt.

Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: Ic3a088f9f08a4fd7ae91fffd14ce8a262021cca0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

205 files changed, 1007 insertions, 5468 deletions

diff --git a/config.tests/common/alloca/alloca.cpp b/config.tests/common/alloca/alloca.cpp
deleted file mode 100644
index 500bdb9ba2..0000000000
--- a/config.tests/common/alloca/alloca.cpp
+++ /dev/null
@@ -1,56 +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$
-**
-****************************************************************************/
-
-#if defined(USE_ALLOCA_H)
-# include <alloca.h>
-# ifdef __QNXNTO__
-// extra include needed in QNX7 to define NULL for the alloca() macro
-#  include <stddef.h>
-# endif
-#elif defined(USE_MALLOC_H)
-# include <malloc.h>
-#else
-# include <stdlib.h>
-#endif
-
-int main(int, char **)
-{
-    alloca(1);
-    return 0;
-}
diff --git a/config.tests/common/alloca/alloca.pro b/config.tests/common/alloca/alloca.pro
deleted file mode 100644
index a2d7d45da2..0000000000
--- a/config.tests/common/alloca/alloca.pro
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES = alloca.cpp
diff --git a/config.tests/common/atomic64/atomic64.cpp b/config.tests/common/atomic64/atomic64.cpp
deleted file mode 100644
index 3181caf15e..0000000000
--- a/config.tests/common/atomic64/atomic64.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the configuration 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 <atomic>
-#include <cstdint>
-
-void test(volatile std::atomic<std::int64_t> &a)
-{
-    std::int64_t v = a.load(std::memory_order_acquire);
-    while (!a.compare_exchange_strong(v, v + 1,
-                                      std::memory_order_acq_rel,
-                                      std::memory_order_acquire)) {
-        v = a.exchange(v - 1);
-    }
-
-    a.store(v + 1, std::memory_order_release);
-}
-
-int main(int, char **)
-{
-    void *ptr = (void*)0xffffffc0; // any random pointer
-    test(*reinterpret_cast<std::atomic<std::int64_t> *>(ptr));
-    return 0;
-}
diff --git a/config.tests/common/atomic64/atomic64.pro b/config.tests/common/atomic64/atomic64.pro
deleted file mode 100644
index c9a85817ca..0000000000
--- a/config.tests/common/atomic64/atomic64.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = atomic64.cpp
-CONFIG += c++11 console
-CONFIG -= qt
diff --git a/config.tests/common/atomicfptr/atomicfptr.cpp b/config.tests/common/atomicfptr/atomicfptr.cpp
deleted file mode 100644
index a993357127..0000000000
--- a/config.tests/common/atomicfptr/atomicfptr.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the FOO module 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 <atomic>
-
-typedef void (*fptr)(int);
-typedef std::atomic<fptr> atomicfptr;
-
-void testfunction(int) { }
-
-void test(volatile atomicfptr &a)
-{
-    fptr v = a.load(std::memory_order_acquire);
-    while (!a.compare_exchange_strong(v, &testfunction,
-                                      std::memory_order_acq_rel,
-                                      std::memory_order_acquire)) {
-        v = a.exchange(&testfunction);
-    }
-
-    a.store(&testfunction, std::memory_order_release);
-}
-
-int main(int, char **)
-{
-    atomicfptr fptr(testfunction);
-    test(fptr);
-    return 0;
-}
diff --git a/config.tests/common/atomicfptr/atomicfptr.pro b/config.tests/common/atomicfptr/atomicfptr.pro
deleted file mode 100644
index 5509862a30..0000000000
--- a/config.tests/common/atomicfptr/atomicfptr.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = atomicfptr.cpp
-CONFIG += c++11 console
-CONFIG -= qt app_bundle
diff --git a/config.tests/common/avx/avx.cpp b/config.tests/common/avx/avx.cpp
deleted file mode 100644
index a26f87f157..0000000000
--- a/config.tests/common/avx/avx.cpp
+++ /dev/null
@@ -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 <immintrin.h>
-
-int main(int, char**)
-{
-    __m256d a = _mm256_setzero_pd();
-    __m256d b = _mm256_set1_pd(42.42);
-    __m256d result = _mm256_add_pd(a, b);
-    (void)result;
-    return 0;
-}
diff --git a/config.tests/common/avx/avx.pro b/config.tests/common/avx/avx.pro
deleted file mode 100644
index fde4adaea2..0000000000
--- a/config.tests/common/avx/avx.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = avx.cpp
-!defined(QMAKE_CFLAGS_AVX, "var"):error("This compiler does not support AVX")
-else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX
diff --git a/config.tests/common/avx2/avx2.cpp b/config.tests/common/avx2/avx2.cpp
deleted file mode 100644
index 2df7e908dd..0000000000
--- a/config.tests/common/avx2/avx2.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the configuration 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 <immintrin.h>
-
-int main(int, char**)
-{
-    /* AVX */
-    _mm256_zeroall();
-    __m256i a = _mm256_setzero_si256();
-
-    /* AVX2 */
-    __m256i b = _mm256_and_si256(a, a);
-    __m256i result = _mm256_add_epi8(a, b);
-    (void)result;
-    return 0;
-}
diff --git a/config.tests/common/avx2/avx2.pro b/config.tests/common/avx2/avx2.pro
deleted file mode 100644
index 1963bdb4b9..0000000000
--- a/config.tests/common/avx2/avx2.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = avx2.cpp
-!defined(QMAKE_CFLAGS_AVX2, "var"):error("This compiler does not support AVX2")
-else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX2
diff --git a/config.tests/common/c++14/c++14.cpp b/config.tests/common/c++14/c++14.cpp
deleted file mode 100644
index 1129213d1f..0000000000
--- a/config.tests/common/c++14/c++14.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the configuration module 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$
-**
-****************************************************************************/
-
-#if __cplusplus > 201103L
-// Compiler claims to support C++14, trust it
-#else
-#  error "__cplusplus must be > 201103L (the value of C++11)"
-#endif
-
-int main(int, char **) { return 0; }
diff --git a/config.tests/common/c++14/c++14.pro b/config.tests/common/c++14/c++14.pro
deleted file mode 100644
index cbd78ba6fe..0000000000
--- a/config.tests/common/c++14/c++14.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = c++14.cpp
-CONFIG += c++11 c++14 console
-CONFIG -= qt
diff --git a/config.tests/common/c++1z/c++1z.cpp b/config.tests/common/c++1z/c++1z.cpp
deleted file mode 100644
index 63c6fb5b8a..0000000000
--- a/config.tests/common/c++1z/c++1z.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the configuration module 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$
-**
-****************************************************************************/
-
-#if __cplusplus > 201402L
-// Compiler claims to support experimental C++1z, trust it
-#else
-#  error "__cplusplus must be > 201402L (the value for C++14)"
-#endif
-
-#include <map> // https://bugs.llvm.org//show_bug.cgi?id=33117
-
-int main(int, char **) { return 0; }
diff --git a/config.tests/common/c++1z/c++1z.pro b/config.tests/common/c++1z/c++1z.pro
deleted file mode 100644
index 3a24946276..0000000000
--- a/config.tests/common/c++1z/c++1z.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = c++1z.cpp
-CONFIG += c++11 c++14 c++1z console
-CONFIG -= qt
diff --git a/config.tests/common/f16c/f16c.cpp b/config.tests/common/f16c/f16c.cpp
deleted file mode 100644
index aeeb35eac3..0000000000
--- a/config.tests/common/f16c/f16c.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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 <immintrin.h>
-
-int main(int, char**)
-{
-    __m128i a = _mm_setzero_si128();
-    __m128 b = _mm_cvtph_ps(a);
-    __m256 b256 = _mm256_cvtph_ps(a);
-    __m128i c = _mm_cvtps_ph(b, 0);
-    c = _mm256_cvtps_ph(b256, 0);
-    (void)c;
-    return 0;
-}
diff --git a/config.tests/common/f16c/f16c.pro b/config.tests/common/f16c/f16c.pro
deleted file mode 100644
index fcab1877c1..0000000000
--- a/config.tests/common/f16c/f16c.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = f16c.cpp
-!defined(QMAKE_CFLAGS_F16C, "var"):error("This compiler does not support F16C")
-else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_F16C
diff --git a/config.tests/common/libproxy/libproxy.cpp b/config.tests/common/libproxy/libproxy.cpp
deleted file mode 100644
index 97a1a94ed7..0000000000
--- a/config.tests/common/libproxy/libproxy.cpp
+++ /dev/null
@@ -1,57 +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 <stdio.h>
-#include <stdlib.h>
-#include <proxy.h>
-
-int main(int, char **)
-{
-    pxProxyFactory *factory = px_proxy_factory_new();
-    char **proxies = px_proxy_factory_get_proxies(factory, "http://qt-project.org");
-    if (proxies) {
-        for (int i = 0; proxies[i]; i++) {
-            printf("%s\n", proxies[i]);
-            free(proxies[i]);
-        }
-        free(proxies);
-    }
-    px_proxy_factory_free(factory);
-    return 0;
-}
diff --git a/config.tests/common/libproxy/libproxy.pro b/config.tests/common/libproxy/libproxy.pro
deleted file mode 100644
index e3183d99e7..0000000000
--- a/config.tests/common/libproxy/libproxy.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = libproxy.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
diff --git a/config.tests/common/sse2/sse2.cpp b/config.tests/common/sse2/sse2.cpp
deleted file mode 100644
index 8b4d5334b5..0000000000
--- a/config.tests/common/sse2/sse2.cpp
+++ /dev/null
@@ -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 <emmintrin.h>
-
-int main(int, char**)
-{
-    __m128i a = _mm_setzero_si128();
-    _mm_maskmoveu_si128(a, _mm_setzero_si128(), 0);
-    return 0;
-}
diff --git a/config.tests/common/sse2/sse2.pro b/config.tests/common/sse2/sse2.pro
deleted file mode 100644
index 75f5266745..0000000000
--- a/config.tests/common/sse2/sse2.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = sse2.cpp
-!defined(QMAKE_CFLAGS_SSE2, var): error("This compiler does not support SSE2")
-else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE2
diff --git a/config.tests/common/sse3/sse3.cpp b/config.tests/common/sse3/sse3.cpp
deleted file mode 100644
index a1e7694daa..0000000000
--- a/config.tests/common/sse3/sse3.cpp
+++ /dev/null
@@ -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 <pmmintrin.h>
-
-int main(int, char**)
-{
-    __m128d a = _mm_set1_pd(6.28);
-    __m128d b = _mm_set1_pd(3.14);
-    __m128d result = _mm_addsub_pd(a, b);
-    result = _mm_movedup_pd(result);
-    return 0;
-}
diff --git a/config.tests/common/sse3/sse3.pro b/config.tests/common/sse3/sse3.pro
deleted file mode 100644
index b26b832e22..0000000000
--- a/config.tests/common/sse3/sse3.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = sse3.cpp
-!defined(QMAKE_CFLAGS_SSE3, "var"):error("This compiler does not support SSE3")
-else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE3
diff --git a/config.tests/common/sse4_1/sse4_1.cpp b/config.tests/common/sse4_1/sse4_1.cpp
deleted file mode 100644
index 7592ac33f4..0000000000
--- a/config.tests/common/sse4_1/sse4_1.cpp
+++ /dev/null
@@ -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 <smmintrin.h>
-
-int main(int, char**)
-{
-    __m128 a = _mm_setzero_ps();
-    _mm_ceil_ps(a);
-    __m128i result = _mm_mullo_epi32(_mm_set1_epi32(42), _mm_set1_epi32(64));
-    (void)result;
-    return 0;
-}
diff --git a/config.tests/common/sse4_1/sse4_1.pro b/config.tests/common/sse4_1/sse4_1.pro
deleted file mode 100644
index bee9c12adb..0000000000
--- a/config.tests/common/sse4_1/sse4_1.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = sse4_1.cpp
-!defined(QMAKE_CFLAGS_SSE4_1, "var"):error("This compiler does not support SSE4.1")
-else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE4_1
diff --git a/config.tests/common/sse4_2/sse4_2.cpp b/config.tests/common/sse4_2/sse4_2.cpp
deleted file mode 100644
index 5ad151c96c..0000000000
--- a/config.tests/common/sse4_2/sse4_2.cpp
+++ /dev/null
@@ -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 <nmmintrin.h>
-
-int main(int, char**)
-{
-    __m128i a = _mm_setzero_si128();
-    __m128i b = _mm_set1_epi32(42);
-    __m128i result = _mm_cmpestrm(a, 16, b, 16, 0);
-    (void)result;
-    return 0;
-}
diff --git a/config.tests/common/sse4_2/sse4_2.pro b/config.tests/common/sse4_2/sse4_2.pro
deleted file mode 100644
index 1626ad748c..0000000000
--- a/config.tests/common/sse4_2/sse4_2.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = sse4_2.cpp
-!defined(QMAKE_CFLAGS_SSE4_2, "var"):error("This compiler does not support SSE4.2")
-else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE4_2
diff --git a/config.tests/common/ssse3/ssse3.cpp b/config.tests/common/ssse3/ssse3.cpp
deleted file mode 100644
index 79c0e2b6b6..0000000000
--- a/config.tests/common/ssse3/ssse3.cpp
+++ /dev/null
@@ -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 <tmmintrin.h>
-
-int main(int, char**)
-{
-    __m128i a = _mm_set1_epi32(42);
-    _mm_abs_epi8(a);
-    __m128i result = _mm_sign_epi16(a, _mm_set1_epi32(64));
-    (void)result;
-    return 0;
-}
diff --git a/config.tests/common/ssse3/ssse3.pro b/config.tests/common/ssse3/ssse3.pro
deleted file mode 100644
index 1d3aebf61d..0000000000
--- a/config.tests/common/ssse3/ssse3.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = ssse3.cpp
-!defined(QMAKE_CFLAGS_SSSE3, "var"):error("This compiler does not support SSSE3")
-else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSSE3
diff --git a/config.tests/qpa/direct2d/direct2d.cpp b/config.tests/qpa/direct2d/direct2d.cpp
deleted file mode 100644
index 87ce1d1dab..0000000000
--- a/config.tests/qpa/direct2d/direct2d.cpp
+++ /dev/null
@@ -1,57 +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 <d3d11_1.h>
-#include <d2d1_1.h>
-#include <d2d1_1helper.h>
-#include <dxgi1_2.h>
-#include <wrl.h>
-#include <dwrite.h>
-
-using Microsoft::WRL::ComPtr;
-
-int main(int, char**)
-{
-    ComPtr<ID2D1Factory1> d2dFactory;
-    D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, d2dFactory.ReleaseAndGetAddressOf());
-    ComPtr<IDXGISurface1> surface;
-    (void)surface; // Q_UNUSED
-
-    return 0;
-}
diff --git a/config.tests/qpa/direct2d/direct2d.pro b/config.tests/qpa/direct2d/direct2d.pro
deleted file mode 100644
index 98527b12a7..0000000000
--- a/config.tests/qpa/direct2d/direct2d.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = direct2d.cpp
-CONFIG -= qt
-CONFIG += console
diff --git a/config.tests/qpa/directfb/directfb.cpp b/config.tests/qpa/directfb/directfb.cpp
deleted file mode 100644
index 72df1195b0..0000000000
--- a/config.tests/qpa/directfb/directfb.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation.
-** 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 <directfb.h>
-
-#ifdef __typeof__
-#error DirectFB headers are unclean and cannot compile
-#endif
-
-int main(int, char **)
-{
-    return 0;
-}
diff --git a/config.tests/qpa/directfb/directfb.pro b/config.tests/qpa/directfb/directfb.pro
deleted file mode 100644
index b138fd0109..0000000000
--- a/config.tests/qpa/directfb/directfb.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = directfb.cpp
-CONFIG -= qt
diff --git a/config.tests/qpa/egl-x11/egl-x11.cpp b/config.tests/qpa/egl-x11/egl-x11.cpp
deleted file mode 100644
index 9cda661a47..0000000000
--- a/config.tests/qpa/egl-x11/egl-x11.cpp
+++ /dev/null
@@ -1,60 +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 <EGL/egl.h>
-#include <xcb/xcb.h>
-#include <X11/Xlib.h>
-#include <X11/Xlib-xcb.h>
-
-// Check if EGL is compatible with X. Some EGL implementations, typically on
-// embedded devices, are not intended to be used together with X. EGL support
-// has to be disabled in plugins like xcb in this case since the native display,
-// window and pixmap types will be different than what an X-based platform
-// plugin would expect.
-
-int main(int, char **)
-{
-    Display *dpy = EGL_DEFAULT_DISPLAY;
-    EGLNativeDisplayType egldpy = XOpenDisplay("");
-    dpy = egldpy;
-    EGLNativeWindowType w = XCreateWindow(dpy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-    XDestroyWindow(dpy, w);
-    XCloseDisplay(dpy);
-    return 0;
-}
diff --git a/config.tests/qpa/egl-x11/egl-x11.pro b/config.tests/qpa/egl-x11/egl-x11.pro
deleted file mode 100644
index fd8479ba35..0000000000
--- a/config.tests/qpa/egl-x11/egl-x11.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = egl-x11.cpp
-
-CONFIG -= qt
diff --git a/config.tests/qpa/egl/egl.cpp b/config.tests/qpa/egl/egl.cpp
deleted file mode 100644
index a4ef1f2f0e..0000000000
--- a/config.tests/qpa/egl/egl.cpp
+++ /dev/null
@@ -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 <EGL/egl.h>
-
-int main(int, char **)
-{
-    EGLint x = 0;
-    EGLDisplay dpy = 0;
-    EGLContext ctx = 0;
-    eglDestroyContext(dpy, ctx);
-    return 0;
-}
diff --git a/config.tests/qpa/egl/egl.pro b/config.tests/qpa/egl/egl.pro
deleted file mode 100644
index 2c4ae07e64..0000000000
--- a/config.tests/qpa/egl/egl.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = egl.cpp
-
-CONFIG -= qt
diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp b/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp
deleted file mode 100644
index e6ba06f89b..0000000000
--- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp
+++ /dev/null
@@ -1,50 +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 <EGL/egl.h>
-#include <bcm_host.h>
-
-int main(int, char **)
-{
-    EGLDisplay dpy = 0;
-    EGLContext ctx = 0;
-    eglDestroyContext(dpy, ctx);
-    vc_dispmanx_display_open(0);
-    return 0;
-}
diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
deleted file mode 100644
index d4afa460f7..0000000000
--- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = eglfs-brcm.cpp
-
-CONFIG -= qt
diff --git a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp
deleted file mode 100644
index fa3e9d33f7..0000000000
--- a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp
+++ /dev/null
@@ -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 <EGL/egl.h>
-#include <EGL/eglext.h>
-
-int main(int, char **)
-{
-    EGLDeviceEXT device = 0;
-    EGLStreamKHR stream = 0;
-    EGLOutputLayerEXT layer = 0;
-    return EGL_DRM_CRTC_EXT;
-}
diff --git a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro
deleted file mode 100644
index 2f20d993f5..0000000000
--- a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = eglfs-egldevice.cpp
-
-CONFIG -= qt
diff --git a/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.cpp b/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.cpp
deleted file mode 100644
index f8481bb27c..0000000000
--- a/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.cpp
+++ /dev/null
@@ -1,50 +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 <EGL/egl.h>
-#include <GLES2/gl2.h>
-
-int main(int, char **)
-{
-    EGLDisplay dpy = 0;
-    EGLContext ctx = 0;
-    mali_native_window *w = 0;
-    eglDestroyContext(dpy, ctx);
-    return 0;
-}
diff --git a/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro b/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro
deleted file mode 100644
index de6f85f20f..0000000000
--- a/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = eglfs-mali-2.cpp
-
-CONFIG -= qt
diff --git a/config.tests/qpa/eglfs-mali/eglfs-mali.cpp b/config.tests/qpa/eglfs-mali/eglfs-mali.cpp
deleted file mode 100644
index 13b10fce02..0000000000
--- a/config.tests/qpa/eglfs-mali/eglfs-mali.cpp
+++ /dev/null
@@ -1,51 +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 <EGL/fbdev_window.h>
-#include <EGL/egl.h>
-#include <GLES2/gl2.h>
-
-int main(int, char **)
-{
-    EGLDisplay dpy = 0;
-    EGLContext ctx = 0;
-    fbdev_window *w = 0;
-    eglDestroyContext(dpy, ctx);
-    return 0;
-}
diff --git a/config.tests/qpa/eglfs-mali/eglfs-mali.pro b/config.tests/qpa/eglfs-mali/eglfs-mali.pro
deleted file mode 100644
index 80f8282842..0000000000
--- a/config.tests/qpa/eglfs-mali/eglfs-mali.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = eglfs-mali.cpp
-
-CONFIG -= qt
diff --git a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp b/config.tests/qpa/eglfs-viv/eglfs-viv.cpp
deleted file mode 100644
index 1f5c5dbf50..0000000000
--- a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp
+++ /dev/null
@@ -1,53 +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 <EGL/egl.h>
-#include <EGL/eglvivante.h>
-
-int main(int, char **)
-{
-#if defined(__INTEGRITY)
-    fbGetDisplay();
-#else
-    // Do not rely on fbGetDisplay() since the signature has changed over time.
-    // Stick to fbGetDisplayByIndex().
-    fbGetDisplayByIndex(0);
-#endif
-    return 0;
-}
diff --git a/config.tests/qpa/eglfs-viv/eglfs-viv.pro b/config.tests/qpa/eglfs-viv/eglfs-viv.pro
deleted file mode 100644
index 2c3dc5cb01..0000000000
--- a/config.tests/qpa/eglfs-viv/eglfs-viv.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCES = eglfs-viv.cpp
-integrity {
-  DEFINES += EGL_API_FB=1
-} else {
-  DEFINES += LINUX=1 EGL_API_FB=1
-}
-CONFIG -= qt
diff --git a/config.tests/qpa/gbm/gbm.cpp b/config.tests/qpa/gbm/gbm.cpp
deleted file mode 100644
index a1f436a7fe..0000000000
--- a/config.tests/qpa/gbm/gbm.cpp
+++ /dev/null
@@ -1,50 +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 <stdlib.h>
-#include <stdint.h>
-extern "C" {
-#include <gbm.h>
-}
-
-int main(int, char **)
-{
-    gbm_surface *surface = 0;
-    return 0;
-}
diff --git a/config.tests/qpa/gbm/gbm.pro b/config.tests/qpa/gbm/gbm.pro
deleted file mode 100644
index 1c08eb4e67..0000000000
--- a/config.tests/qpa/gbm/gbm.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = gbm.cpp
-CONFIG -= qt
diff --git a/config.tests/qpa/integrityfb/integrityfb.cpp b/config.tests/qpa/integrityfb/integrityfb.cpp
deleted file mode 100644
index 7f2dd0705f..0000000000
--- a/config.tests/qpa/integrityfb/integrityfb.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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 <device/fbdriver.h>
-
-int main(int, char **)
-{
-    FBDriver *driver = 0;
-    return 0;
-}
diff --git a/config.tests/qpa/integrityfb/integrityfb.pro b/config.tests/qpa/integrityfb/integrityfb.pro
deleted file mode 100644
index 5da4e77923..0000000000
--- a/config.tests/qpa/integrityfb/integrityfb.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = integrityfb.cpp
-
-CONFIG -= qt
diff --git a/config.tests/qpa/integrityhid/integrityhid.cpp b/config.tests/qpa/integrityhid/integrityhid.cpp
deleted file mode 100644
index 1493e7c7e4..0000000000
--- a/config.tests/qpa/integrityhid/integrityhid.cpp
+++ /dev/null
@@ -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 <stdlib.h>
-#include <stdint.h>
-#include <device/hiddriver.h>
-
-int main(int, char **)
-{
-    HIDDriver *driver;
-    uintptr_t devicecontext;
-    uint32_t device_id;
-    gh_hid_enum_devices(driver, &device_id, &devicecontext);
-
-    return 0;
-}
diff --git a/config.tests/qpa/integrityhid/integrityhid.pro b/config.tests/qpa/integrityhid/integrityhid.pro
deleted file mode 100644
index 87fafde897..0000000000
--- a/config.tests/qpa/integrityhid/integrityhid.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = integrityhid.cpp
-CONFIG -= qt
diff --git a/config.tests/qpa/kms/kms.cpp b/config.tests/qpa/kms/kms.cpp
deleted file mode 100644
index fbd1bf095d..0000000000
--- a/config.tests/qpa/kms/kms.cpp
+++ /dev/null
@@ -1,51 +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 <stdlib.h>
-#include <stdint.h>
-extern "C" {
-#include <xf86drmMode.h>
-#include <xf86drm.h>
-}
-
-int main(int, char **)
-{
-    drmModeCrtcPtr currentMode = drmModeGetCrtc(0, 0);
-    return 0;
-}
diff --git a/config.tests/qpa/kms/kms.pro b/config.tests/qpa/kms/kms.pro
deleted file mode 100644
index c823914308..0000000000
--- a/config.tests/qpa/kms/kms.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = kms.cpp
-CONFIG -= qt
diff --git a/config.tests/qpa/linuxfb/linuxfb.cpp b/config.tests/qpa/linuxfb/linuxfb.cpp
deleted file mode 100644
index ed9f9b242e..0000000000
--- a/config.tests/qpa/linuxfb/linuxfb.cpp
+++ /dev/null
@@ -1,54 +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 <linux/fb.h>
-#include <sys/kd.h>
-#include <sys/ioctl.h>
-
-int main(int, char **)
-{
-    fb_fix_screeninfo finfo;
-    fb_var_screeninfo vinfo;
-
-    int fd = 3;
-    ioctl(fd, FBIOGET_FSCREENINFO, &finfo);
-    ioctl(fd, FBIOGET_VSCREENINFO, &vinfo);
-
-    return 0;
-}
diff --git a/config.tests/qpa/linuxfb/linuxfb.pro b/config.tests/qpa/linuxfb/linuxfb.pro
deleted file mode 100644
index 45db4b78dd..0000000000
--- a/config.tests/qpa/linuxfb/linuxfb.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = linuxfb.cpp
-
-CONFIG -= qt
diff --git a/config.tests/qpa/mirclient/mirclient.cpp b/config.tests/qpa/mirclient/mirclient.cpp
deleted file mode 100644
index c93f8509ef..0000000000
--- a/config.tests/qpa/mirclient/mirclient.cpp
+++ /dev/null
@@ -1,53 +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 <mir_toolkit/mir_client_library.h>
-#include <ubuntu/application/lifecycle_delegate.h>
-#include <EGL/egl.h>
-
-static void surfaceCreateCallback(MirSurface*, void*)
-{
-}
-
-
-int main(int, char **)
-{
-    u_application_lifecycle_delegate_new();
-    mir_surface_create(0, surfaceCreateCallback, 0);
-}
diff --git a/config.tests/qpa/mirclient/mirclient.pro b/config.tests/qpa/mirclient/mirclient.pro
deleted file mode 100644
index 3e87194e4e..0000000000
--- a/config.tests/qpa/mirclient/mirclient.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = mirclient.cpp
-CONFIG -= qt
diff --git a/config.tests/qpa/wayland-server/wayland-server.pro b/config.tests/qpa/wayland-server/wayland-server.pro
deleted file mode 100644
index 969bc542bb..0000000000
--- a/config.tests/qpa/wayland-server/wayland-server.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = wl.cpp
-
-CONFIG -= qt
diff --git a/config.tests/qpa/wayland-server/wl.cpp b/config.tests/qpa/wayland-server/wl.cpp
deleted file mode 100644
index a5ec3b5150..0000000000
--- a/config.tests/qpa/wayland-server/wl.cpp
+++ /dev/null
@@ -1,46 +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 <wayland-server.h>
-
-int main(int, char **)
-{
-    wl_display_create();
-    return 0;
-}
diff --git a/config.tests/qpa/xcb-glx/xcb-glx.cpp b/config.tests/qpa/xcb-glx/xcb-glx.cpp
deleted file mode 100644
index 3e78941f5c..0000000000
--- a/config.tests/qpa/xcb-glx/xcb-glx.cpp
+++ /dev/null
@@ -1,55 +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 <xcb/xcb.h>
-#include <xcb/glx.h>
-
-int main(int, char **)
-{
-    int primaryScreen = 0;
-
-    xcb_connection_t *connection = xcb_connect("", &primaryScreen);
-    xcb_generic_error_t *error = 0;
-    xcb_glx_query_version_cookie_t xglx_query_cookie = xcb_glx_query_version(connection,
-                                                                             XCB_GLX_MAJOR_VERSION,
-                                                                             XCB_GLX_MINOR_VERSION);
-    xcb_glx_query_version_reply(connection, xglx_query_cookie, &error);
-
-    return 0;
-}
diff --git a/config.tests/qpa/xcb-glx/xcb-glx.pro b/config.tests/qpa/xcb-glx/xcb-glx.pro
deleted file mode 100644
index 8086e3a388..0000000000
--- a/config.tests/qpa/xcb-glx/xcb-glx.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = xcb-glx.cpp
-CONFIG -= qt
diff --git a/config.tests/qpa/xcb-render/xcb-render.cpp b/config.tests/qpa/xcb-render/xcb-render.cpp
deleted file mode 100644
index d19a9502bc..0000000000
--- a/config.tests/qpa/xcb-render/xcb-render.cpp
+++ /dev/null
@@ -1,70 +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 <xcb/xcb.h>
-#include <xcb/render.h>
-
-// 'template' is used as a function argument name in xcb_renderutil.h
-#define template template_param
-// extern "C" is missing too
-extern "C" {
-#include <xcb/xcb_renderutil.h>
-}
-#undef template
-
-int main(int, char **)
-{
-    int primaryScreen = 0;
-    xcb_generic_error_t *error = 0;
-
-    xcb_connection_t *connection = xcb_connect("", &primaryScreen);
-    xcb_render_query_pict_formats_cookie_t formatsCookie =
-        xcb_render_query_pict_formats(connection);
-
-    xcb_render_query_pict_formats_reply_t *formatsReply =
-        xcb_render_query_pict_formats_reply(
-                connection,
-                formatsCookie,
-                &error);
-
-    xcb_render_util_find_standard_format(formatsReply,
-            XCB_PICT_STANDARD_ARGB_32);
-
-    return 0;
-}
diff --git a/config.tests/qpa/xcb-render/xcb-render.pro b/config.tests/qpa/xcb-render/xcb-render.pro
deleted file mode 100644
index 7555fa9b61..0000000000
--- a/config.tests/qpa/xcb-render/xcb-render.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = xcb-render.cpp
-CONFIG -= qt
diff --git a/config.tests/qpa/xcb-syslibs/xcb-syslibs.pro b/config.tests/qpa/xcb-syslibs/xcb-syslibs.pro
deleted file mode 100644
index 6363ae90ee..0000000000
--- a/config.tests/qpa/xcb-syslibs/xcb-syslibs.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = xcb.cpp
-CONFIG -= qt
diff --git a/config.tests/qpa/xcb-syslibs/xcb.cpp b/config.tests/qpa/xcb-syslibs/xcb.cpp
deleted file mode 100644
index 00d0da1b6c..0000000000
--- a/config.tests/qpa/xcb-syslibs/xcb.cpp
+++ /dev/null
@@ -1,61 +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 <xcb/xcb.h>
-
-// FIXME This workaround can be removed for xcb-icccm > 3.8
-#define class class_name
-#include <xcb/xcb_icccm.h>
-#undef class
-
-#include <xcb/xfixes.h>
-#include <xcb/xcb_image.h>
-#include <xcb/xcb_keysyms.h>
-#include <xcb/sync.h>
-#include <xcb/randr.h>
-#include <xcb/shm.h>
-
-int main(int, char **)
-{
-    int primaryScreen = 0;
-
-    xcb_connection_t *connection = xcb_connect("", &primaryScreen);
-
-    return 0;
-}
diff --git a/config.tests/qpa/xcb-xkb/xcb-xkb.cpp b/config.tests/qpa/xcb-xkb/xcb-xkb.cpp
deleted file mode 100644
index f7ec9a7d43..0000000000
--- a/config.tests/qpa/xcb-xkb/xcb-xkb.cpp
+++ /dev/null
@@ -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$
-**
-****************************************************************************/
-
-// This is needed to make Qt compile together with XKB. xkb.h is using a variable
-// which is called 'explicit', this is a reserved keyword in c++ */
-#define explicit dont_use_cxx_explicit
-#include <xcb/xkb.h>
-#undef explicit
-
-int main(int, char **)
-{
-    // This takes more arguments in xcb-xkb < 1.10.
-    xcb_xkb_get_kbd_by_name_unchecked(NULL, 0, 0, 0, 0);
-
-    return 0;
-}
diff --git a/config.tests/qpa/xcb-xkb/xcb-xkb.pro b/config.tests/qpa/xcb-xkb/xcb-xkb.pro
deleted file mode 100644
index 804be7b894..0000000000
--- a/config.tests/qpa/xcb-xkb/xcb-xkb.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = xcb-xkb.cpp
-CONFIG -= qt
diff --git a/config.tests/qpa/xcb-xlib/xcb-xlib.cpp b/config.tests/qpa/xcb-xlib/xcb-xlib.cpp
deleted file mode 100644
index 5a850404e1..0000000000
--- a/config.tests/qpa/xcb-xlib/xcb-xlib.cpp
+++ /dev/null
@@ -1,50 +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 <xcb/xcb.h>
-#include <X11/Xlib.h>
-#include <X11/Xlib-xcb.h>
-
-int main(int, char **)
-{
-    Display *dpy = XOpenDisplay("");
-    xcb_connection_t *connection =  XGetXCBConnection(dpy);
-
-    return 0;
-}
diff --git a/config.tests/qpa/xcb-xlib/xcb-xlib.pro b/config.tests/qpa/xcb-xlib/xcb-xlib.pro
deleted file mode 100644
index 0e98a00fd0..0000000000
--- a/config.tests/qpa/xcb-xlib/xcb-xlib.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = xcb-xlib.cpp
-CONFIG -= qt
diff --git a/config.tests/qpa/xcb/xcb.cpp b/config.tests/qpa/xcb/xcb.cpp
deleted file mode 100644
index efb4f0ca2e..0000000000
--- a/config.tests/qpa/xcb/xcb.cpp
+++ /dev/null
@@ -1,51 +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 <xcb/xcb.h>
-
-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/qpa/xcb/xcb.pro b/config.tests/qpa/xcb/xcb.pro
deleted file mode 100644
index 6363ae90ee..0000000000
--- a/config.tests/qpa/xcb/xcb.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = xcb.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/clock-gettime/clock-gettime.cpp b/config.tests/unix/clock-gettime/clock-gettime.cpp
deleted file mode 100644
index cef9f6a1ae..0000000000
--- a/config.tests/unix/clock-gettime/clock-gettime.cpp
+++ /dev/null
@@ -1,53 +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 <unistd.h>
-#include <time.h>
-
-int main(int, char **)
-{
-#if (defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0)) || defined(__OpenBSD__)
-    timespec ts;
-    clock_gettime(CLOCK_REALTIME, &ts);
-#else
-#  error "Feature _POSIX_TIMERS not available"
-#endif
-    return 0;
-}
-
diff --git a/config.tests/unix/clock-gettime/clock-gettime.pro b/config.tests/unix/clock-gettime/clock-gettime.pro
deleted file mode 100644
index 985b94e3fe..0000000000
--- a/config.tests/unix/clock-gettime/clock-gettime.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = clock-gettime.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/clock-monotonic/clock-monotonic.cpp b/config.tests/unix/clock-monotonic/clock-monotonic.cpp
deleted file mode 100644
index 777a6d1c21..0000000000
--- a/config.tests/unix/clock-monotonic/clock-monotonic.cpp
+++ /dev/null
@@ -1,53 +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 <unistd.h>
-#include <time.h>
-
-int main(int, char **)
-{
-#if defined(_POSIX_MONOTONIC_CLOCK) && (_POSIX_MONOTONIC_CLOCK-0 >= 0)
-    timespec ts;
-    clock_gettime(CLOCK_MONOTONIC, &ts);
-#else
-#  error "Feature _POSIX_MONOTONIC_CLOCK not available"
-#endif
-    return 0;
-}
-
diff --git a/config.tests/unix/clock-monotonic/clock-monotonic.pro b/config.tests/unix/clock-monotonic/clock-monotonic.pro
deleted file mode 100644
index 4c421c2413..0000000000
--- a/config.tests/unix/clock-monotonic/clock-monotonic.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = clock-monotonic.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/cloexec/cloexec.cpp b/config.tests/unix/cloexec/cloexec.cpp
deleted file mode 100644
index cc6948a280..0000000000
--- a/config.tests/unix/cloexec/cloexec.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the configuration module 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$
-**
-****************************************************************************/
-
-#define _GNU_SOURCE 1
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-int main()
-{
-    int pipes[2];
-    (void) pipe2(pipes, O_CLOEXEC | O_NONBLOCK);
-    (void) fcntl(0, F_DUPFD_CLOEXEC, 0);
-    (void) dup3(0, 3, O_CLOEXEC);
-#if defined(__NetBSD__)
-    (void) paccept(0, 0, 0, NULL, SOCK_CLOEXEC | SOCK_NONBLOCK);
-#else
-    (void) accept4(0, 0, 0, SOCK_CLOEXEC | SOCK_NONBLOCK);
-#endif
-    return 0;
-}
diff --git a/config.tests/unix/cloexec/cloexec.pro b/config.tests/unix/cloexec/cloexec.pro
deleted file mode 100644
index bc735f9b1f..0000000000
--- a/config.tests/unix/cloexec/cloexec.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = cloexec.cpp
-CONFIG -= qt
-QT =
diff --git a/config.tests/unix/cups/cups.cpp b/config.tests/unix/cups/cups.cpp
deleted file mode 100644
index 20cdd7e969..0000000000
--- a/config.tests/unix/cups/cups.cpp
+++ /dev/null
@@ -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 <cups/cups.h>
-
-int main(int, char **)
-{
-    // CUPS 1.4 test
-    cupsGetNamedDest(CUPS_HTTP_DEFAULT, NULL, NULL);
-    return 0;
-}
diff --git a/config.tests/unix/cups/cups.pro b/config.tests/unix/cups/cups.pro
deleted file mode 100644
index d19ce7d9a6..0000000000
--- a/config.tests/unix/cups/cups.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = cups.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/db2/db2.cpp b/config.tests/unix/db2/db2.cpp
deleted file mode 100644
index 98b90f78be..0000000000
--- a/config.tests/unix/db2/db2.cpp
+++ /dev/null
@@ -1,46 +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 <sqlcli.h>
-#include <sqlcli1.h>
-
-int main(int, char **)
-{
-    return 0;
-}
diff --git a/config.tests/unix/db2/db2.pro b/config.tests/unix/db2/db2.pro
deleted file mode 100644
index ef233fc184..0000000000
--- a/config.tests/unix/db2/db2.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = db2.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/dbus/dbus.cpp b/config.tests/unix/dbus/dbus.cpp
deleted file mode 100644
index 8b1e241cd3..0000000000
--- a/config.tests/unix/dbus/dbus.cpp
+++ /dev/null
@@ -1,46 +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 <dbus/dbus.h>
-
-int main(int, char **)
-{
-    (void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);
-    return 0;
-}
diff --git a/config.tests/unix/dbus/dbus.pro b/config.tests/unix/dbus/dbus.pro
deleted file mode 100644
index f9d793b867..0000000000
--- a/config.tests/unix/dbus/dbus.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-SOURCES = dbus.cpp
-CONFIG -= qt
-
-CONFIG += build_all
-CONFIG(debug, debug|release): \
-    LIBS += $$LIBS_DEBUG
-else: \
-    LIBS += $$LIBS_RELEASE
diff --git a/config.tests/unix/dlopen/dlopen.cpp b/config.tests/unix/dlopen/dlopen.cpp
deleted file mode 100644
index 454ca3bf72..0000000000
--- a/config.tests/unix/dlopen/dlopen.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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 <dlfcn.h>
-
-int main(int, char **)
-{
-    dlopen(0, 0);
-}
diff --git a/config.tests/unix/dlopen/dlopen.pro b/config.tests/unix/dlopen/dlopen.pro
deleted file mode 100644
index 1d34314332..0000000000
--- a/config.tests/unix/dlopen/dlopen.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = $$PWD/dlopen.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/doubleconversion/doubleconversion.cpp b/config.tests/unix/doubleconversion/doubleconversion.cpp
deleted file mode 100644
index c26eef97e5..0000000000
--- a/config.tests/unix/doubleconversion/doubleconversion.cpp
+++ /dev/null
@@ -1,46 +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 <double-conversion/double-conversion.h>
-
-int main(int, char **)
-{
-    int flags = double_conversion::StringToDoubleConverter::NO_FLAGS;
-    return flags;
-}
diff --git a/config.tests/unix/doubleconversion/doubleconversion.pro b/config.tests/unix/doubleconversion/doubleconversion.pro
deleted file mode 100644
index 8253d0c2a5..0000000000
--- a/config.tests/unix/doubleconversion/doubleconversion.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = doubleconversion.cpp
-CONFIG -= qt
-CONFIG += console
diff --git a/config.tests/unix/evdev/evdev.cpp b/config.tests/unix/evdev/evdev.cpp
deleted file mode 100644
index b00b1a8141..0000000000
--- a/config.tests/unix/evdev/evdev.cpp
+++ /dev/null
@@ -1,59 +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$
-**
-****************************************************************************/
-
-#if defined(__FreeBSD__)
-#include <dev/evdev/input.h>
-#else
-#include <linux/input.h>
-#include <linux/kd.h>
-#endif
-
-enum {
-    e1 = ABS_PRESSURE,
-    e2 = ABS_X,
-    e3 = REL_X,
-    e4 = SYN_REPORT,
-};
-
-int main()
-{
-    ::input_event buf[32];
-    (void) buf;
-    return 0;
-}
diff --git a/config.tests/unix/evdev/evdev.pro b/config.tests/unix/evdev/evdev.pro
deleted file mode 100644
index 42db391216..0000000000
--- a/config.tests/unix/evdev/evdev.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = evdev.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/eventfd/eventfd.pro b/config.tests/unix/eventfd/eventfd.pro
deleted file mode 100644
index de99717750..0000000000
--- a/config.tests/unix/eventfd/eventfd.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = main.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/eventfd/main.cpp b/config.tests/unix/eventfd/main.cpp
deleted file mode 100644
index 0f65fe7e2b..0000000000
--- a/config.tests/unix/eventfd/main.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation.
-** 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 <sys/eventfd.h>
-
-int main()
-{
-    eventfd_t value;
-    int fd = eventfd(0, EFD_CLOEXEC);
-    eventfd_read(fd, &value);
-    eventfd_write(fd, value);
-    return 0;
-}
diff --git a/config.tests/unix/fontconfig/fontconfig.cpp b/config.tests/unix/fontconfig/fontconfig.cpp
deleted file mode 100644
index 49c0d94a1e..0000000000
--- a/config.tests/unix/fontconfig/fontconfig.cpp
+++ /dev/null
@@ -1,59 +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 <ft2build.h>
-#include FT_FREETYPE_H
-#include <fontconfig/fontconfig.h>
-
-#ifndef FC_RGBA_UNKNOWN
-#  error "This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define"
-#endif
-
-#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20110)
-#  error "This version of freetype is too old."
-#endif
-
-int main(int, char **)
-{
-    FT_Face face;
-    face = 0;
-    FcPattern *pattern;
-    pattern = 0;
-    return 0;
-}
diff --git a/config.tests/unix/fontconfig/fontconfig.pro b/config.tests/unix/fontconfig/fontconfig.pro
deleted file mode 100644
index d6fd00aa3c..0000000000
--- a/config.tests/unix/fontconfig/fontconfig.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = fontconfig.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/freetype/freetype.cpp b/config.tests/unix/freetype/freetype.cpp
deleted file mode 100644
index c051600b02..0000000000
--- a/config.tests/unix/freetype/freetype.cpp
+++ /dev/null
@@ -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 <ft2build.h>
-#include FT_FREETYPE_H
-
-#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20200)
-#  error "This version of freetype is too old."
-#endif
-
-int main(int, char **)
-{
-    FT_Face face;
-    face = 0;
-    return 0;
-}
diff --git a/config.tests/unix/freetype/freetype.pro b/config.tests/unix/freetype/freetype.pro
deleted file mode 100644
index 525b60121b..0000000000
--- a/config.tests/unix/freetype/freetype.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = freetype.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/getaddrinfo/getaddrinfo.pro b/config.tests/unix/getaddrinfo/getaddrinfo.pro
deleted file mode 100644
index 18e40971e5..0000000000
--- a/config.tests/unix/getaddrinfo/getaddrinfo.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = getaddrinfotest.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
deleted file mode 100644
index b4deaae91e..0000000000
--- a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
+++ /dev/null
@@ -1,62 +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$
-**
-****************************************************************************/
-
-/* Sample program for configure to test for getaddrinfo on the unix
-     platform. we check for all structures and functions required. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef __MINGW32__
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#endif
-
-int main()
-{
-    addrinfo *res = 0;
-    if (getaddrinfo("foo", 0, 0, &res) == 0)
-        freeaddrinfo(res);
-    gai_strerror(0);
-
-    return 0;
-}
diff --git a/config.tests/unix/getifaddrs/getifaddrs.cpp b/config.tests/unix/getifaddrs/getifaddrs.cpp
deleted file mode 100644
index a66ce4af37..0000000000
--- a/config.tests/unix/getifaddrs/getifaddrs.cpp
+++ /dev/null
@@ -1,54 +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$
-**
-****************************************************************************/
-
-/* Sample program for configure to test for if_nametoindex support
-on target platforms. */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <ifaddrs.h>
-
-int main()
-{
-    ifaddrs *list;
-    getifaddrs(&list);
-    freeifaddrs(list);
-    return 0;
-}
diff --git a/config.tests/unix/getifaddrs/getifaddrs.pro b/config.tests/unix/getifaddrs/getifaddrs.pro
deleted file mode 100644
index db2956a338..0000000000
--- a/config.tests/unix/getifaddrs/getifaddrs.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = getifaddrs.cpp
-CONFIG -= qt
-QT =
diff --git a/config.tests/unix/glib/glib.cpp b/config.tests/unix/glib/glib.cpp
deleted file mode 100644
index 63456c662d..0000000000
--- a/config.tests/unix/glib/glib.cpp
+++ /dev/null
@@ -1,56 +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$
-**
-****************************************************************************/
-
-typedef struct _GMainContext GMainContext;
-
-#include <glib.h>
-
-int main(int, char **)
-{
-    GMainContext *context;
-    GSource *source;
-    GPollFD *pollfd = NULL;
-    if (!g_thread_supported())
-        g_thread_init(NULL);
-    context = g_main_context_default();
-    (void)context;
-    source = g_source_new(0, 0);
-    g_source_add_poll(source, pollfd);
-    return 0;
-}
diff --git a/config.tests/unix/glib/glib.pro b/config.tests/unix/glib/glib.pro
deleted file mode 100644
index 15d059df77..0000000000
--- a/config.tests/unix/glib/glib.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = glib.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/harfbuzz/harfbuzz.cpp b/config.tests/unix/harfbuzz/harfbuzz.cpp
deleted file mode 100644
index d1d0530423..0000000000
--- a/config.tests/unix/harfbuzz/harfbuzz.cpp
+++ /dev/null
@@ -1,58 +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 <harfbuzz/hb.h>
-
-#if !HB_VERSION_ATLEAST(0, 9, 42)
-#  error "This version of harfbuzz is too old."
-#endif
-
-int main(int, char **)
-{
-    hb_buffer_t *buffer = hb_buffer_create();
-
-    const uint16_t string[] = { 'A', 'b', 'c' };
-    hb_buffer_add_utf16(buffer, string, 3, 0, 3);
-    hb_buffer_guess_segment_properties(buffer);
-    hb_buffer_set_flags(buffer, hb_buffer_flags_t(HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES));
-
-    hb_buffer_destroy(buffer);
-
-    return 0;
-}
diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro
deleted file mode 100644
index 71a7c355cb..0000000000
--- a/config.tests/unix/harfbuzz/harfbuzz.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = harfbuzz.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/ibase/ibase.cpp b/config.tests/unix/ibase/ibase.cpp
deleted file mode 100644
index c1e2a24b51..0000000000
--- a/config.tests/unix/ibase/ibase.cpp
+++ /dev/null
@@ -1,45 +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 <ibase.h>
-
-int main(int, char **)
-{
-    return 0;
-}
diff --git a/config.tests/unix/ibase/ibase.pro b/config.tests/unix/ibase/ibase.pro
deleted file mode 100644
index 8c47f66954..0000000000
--- a/config.tests/unix/ibase/ibase.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = ibase.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/icu/icu.cpp b/config.tests/unix/icu/icu.cpp
deleted file mode 100644
index e74de43980..0000000000
--- a/config.tests/unix/icu/icu.cpp
+++ /dev/null
@@ -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 <unicode/utypes.h>
-#include <unicode/ucol.h>
-#include <unicode/ustring.h>
-
-int main(int, char **)
-{
-    UErrorCode status = U_ZERO_ERROR;
-    UCollator *collator = ucol_open("ru_RU", &status);
-    if (U_FAILURE(status))
-        return 0;
-    ucol_close(collator);
-    return 0;
-}
diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro
deleted file mode 100644
index eeed0eaff3..0000000000
--- a/config.tests/unix/icu/icu.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-SOURCES = icu.cpp
-CONFIG += console
-CONFIG -= qt dylib
-
-CONFIG += build_all
-CONFIG(debug, debug|release): \
-    LIBS += $$LIBS_DEBUG
-else: \
-    LIBS += $$LIBS_RELEASE
diff --git a/config.tests/unix/inotify/inotify.pro b/config.tests/unix/inotify/inotify.pro
deleted file mode 100644
index 35880de3c0..0000000000
--- a/config.tests/unix/inotify/inotify.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = inotifytest.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/inotify/inotifytest.cpp b/config.tests/unix/inotify/inotifytest.cpp
deleted file mode 100644
index cb43bc81b7..0000000000
--- a/config.tests/unix/inotify/inotifytest.cpp
+++ /dev/null
@@ -1,48 +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 <sys/inotify.h>
-
-int main()
-{
-    inotify_init();
-    inotify_add_watch(0, "foobar", IN_ACCESS);
-    inotify_rm_watch(0, 1);
-    return 0;
-}
diff --git a/config.tests/unix/ipc_posix/ipc.cpp b/config.tests/unix/ipc_posix/ipc.cpp
deleted file mode 100644
index 9d14145ea2..0000000000
--- a/config.tests/unix/ipc_posix/ipc.cpp
+++ /dev/null
@@ -1,55 +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 <sys/types.h>
-#include <sys/mman.h>
-#include <semaphore.h>
-#include <fcntl.h>
-
-int main(int, char **)
-{
-    sem_t *semaphore = sem_open("test", O_CREAT | O_EXCL, 0666, 0);
-    if (semaphore != SEM_FAILED)
-        sem_close(semaphore);
-
-    shm_open("test", O_RDWR | O_CREAT | O_EXCL, 0666);
-    shm_unlink("test");
-
-    return 0;
-}
diff --git a/config.tests/unix/ipc_posix/ipc_posix.pro b/config.tests/unix/ipc_posix/ipc_posix.pro
deleted file mode 100644
index a8bcb397bb..0000000000
--- a/config.tests/unix/ipc_posix/ipc_posix.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-SOURCES = ipc.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
-linux:LIBS += -lpthread -lrt
diff --git a/config.tests/unix/ipc_sysv/ipc.cpp b/config.tests/unix/ipc_sysv/ipc.cpp
deleted file mode 100644
index deb57622ba..0000000000
--- a/config.tests/unix/ipc_sysv/ipc.cpp
+++ /dev/null
@@ -1,57 +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 <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <sys/shm.h>
-#include <fcntl.h>
-
-int main(int, char **)
-{
-    key_t unix_key = ftok("test", 'Q');
-    int semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL);
-    if (semaphore != -1)
-        semctl(semaphore, 0, IPC_RMID, 0);
-
-    shmget(unix_key, 0, 0666 | IPC_CREAT | IPC_EXCL);
-    shmctl(0, 0, static_cast<struct shmid_ds *>(0));
-
-    return 0;
-}
diff --git a/config.tests/unix/ipc_sysv/ipc_sysv.pro b/config.tests/unix/ipc_sysv/ipc_sysv.pro
deleted file mode 100644
index 1b6de0296f..0000000000
--- a/config.tests/unix/ipc_sysv/ipc_sysv.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = ipc.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
diff --git a/config.tests/unix/ipv6ifname/ipv6ifname.cpp b/config.tests/unix/ipv6ifname/ipv6ifname.cpp
deleted file mode 100644
index fd58e85adb..0000000000
--- a/config.tests/unix/ipv6ifname/ipv6ifname.cpp
+++ /dev/null
@@ -1,53 +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$
-**
-****************************************************************************/
-
-/* Sample program for configure to test for if_nametoindex support
-on target platforms. */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
-
-int main()
-{
-    char buf[IFNAMSIZ];
-    if_nametoindex("eth0");
-    if_indextoname(1, buf);
-    return 0;
-}
diff --git a/config.tests/unix/ipv6ifname/ipv6ifname.pro b/config.tests/unix/ipv6ifname/ipv6ifname.pro
deleted file mode 100644
index 7574dce180..0000000000
--- a/config.tests/unix/ipv6ifname/ipv6ifname.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = ipv6ifname.cpp
-CONFIG -= qt
-QT =
diff --git a/config.tests/unix/journald/journald.c b/config.tests/unix/journald/journald.c
deleted file mode 100644
index 6b14cd7c69..0000000000
--- a/config.tests/unix/journald/journald.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Jolla Ltd, author: <robin.burchell@jollamobile.com>
-** 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 <systemd/sd-journal.h>
-#include <syslog.h>
-
-int main(int argc, char **argv)
-{
-    sd_journal_send("MESSAGE=%s",     "test message",
-                    "PRIORITY=%i",    LOG_INFO,
-                    "CODE_FUNC=%s",   "unknown",
-                    "CODE_LINE=%d",   0,
-                    "CODE_FILE=%s",   "foo.c",
-                    NULL);
-    return 0;
-}
diff --git a/config.tests/unix/journald/journald.pro b/config.tests/unix/journald/journald.pro
deleted file mode 100644
index deb28ae97f..0000000000
--- a/config.tests/unix/journald/journald.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = journald.c
-
-CONFIG -= qt
diff --git a/config.tests/unix/lgmon/lgmon.cpp b/config.tests/unix/lgmon/lgmon.cpp
deleted file mode 100644
index 2f3800a422..0000000000
--- a/config.tests/unix/lgmon/lgmon.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
-** 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 <lgmon.h>
-
-int main(int, char **)
-{
-    lgmon_supported(getpid());
-    return 0;
-}
-
diff --git a/config.tests/unix/lgmon/lgmon.pro b/config.tests/unix/lgmon/lgmon.pro
deleted file mode 100644
index 33633b19f8..0000000000
--- a/config.tests/unix/lgmon/lgmon.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = lgmon.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/libinput/libinput.cpp b/config.tests/unix/libinput/libinput.cpp
deleted file mode 100644
index 87bfe5c889..0000000000
--- a/config.tests/unix/libinput/libinput.cpp
+++ /dev/null
@@ -1,46 +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 <libinput.h>
-
-int main()
-{
-    libinput_udev_create_context(NULL, NULL, NULL);
-    return 0;
-}
diff --git a/config.tests/unix/libinput/libinput.pro b/config.tests/unix/libinput/libinput.pro
deleted file mode 100644
index 941a0b73ef..0000000000
--- a/config.tests/unix/libinput/libinput.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = libinput.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/libinput_axis_api/libinput_axis_api.cpp b/config.tests/unix/libinput_axis_api/libinput_axis_api.cpp
deleted file mode 100644
index d469b8920e..0000000000
--- a/config.tests/unix/libinput_axis_api/libinput_axis_api.cpp
+++ /dev/null
@@ -1,46 +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 <libinput.h>
-
-int main()
-{
-    libinput_event_pointer_has_axis(nullptr, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
-    return 0;
-}
diff --git a/config.tests/unix/libinput_axis_api/libinput_axis_api.pro b/config.tests/unix/libinput_axis_api/libinput_axis_api.pro
deleted file mode 100644
index 7221e62792..0000000000
--- a/config.tests/unix/libinput_axis_api/libinput_axis_api.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = libinput_axis_api.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/libjpeg/libjpeg.cpp b/config.tests/unix/libjpeg/libjpeg.cpp
deleted file mode 100644
index 106043c608..0000000000
--- a/config.tests/unix/libjpeg/libjpeg.cpp
+++ /dev/null
@@ -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 <sys/types.h>
-#include <stdio.h>
-extern "C" {
-#include <jpeglib.h>
-}
-
-j_compress_ptr cinfo;
-
-int main(int, char **)
-{
-    jpeg_create_compress(cinfo);
-    return 0;
-}
diff --git a/config.tests/unix/libjpeg/libjpeg.pro b/config.tests/unix/libjpeg/libjpeg.pro
deleted file mode 100644
index 173249c634..0000000000
--- a/config.tests/unix/libjpeg/libjpeg.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = libjpeg.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/libpng/libpng.cpp b/config.tests/unix/libpng/libpng.cpp
deleted file mode 100644
index d3f836e49e..0000000000
--- a/config.tests/unix/libpng/libpng.cpp
+++ /dev/null
@@ -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 <png.h>
-
-int main(int, char **)
-{
-    png_structp png_ptr;
-    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0);
-    return 0;
-}
diff --git a/config.tests/unix/libpng/libpng.pro b/config.tests/unix/libpng/libpng.pro
deleted file mode 100644
index 72e5e77b06..0000000000
--- a/config.tests/unix/libpng/libpng.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = libpng.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/libudev/libudev.cpp b/config.tests/unix/libudev/libudev.cpp
deleted file mode 100644
index 6636f49732..0000000000
--- a/config.tests/unix/libudev/libudev.cpp
+++ /dev/null
@@ -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 <libudev.h>
-
-int main()
-{
-    udev *u = udev_new();
-    udev_unref(u);
-    return 0;
-}
diff --git a/config.tests/unix/libudev/libudev.pro b/config.tests/unix/libudev/libudev.pro
deleted file mode 100644
index b557e7b17b..0000000000
--- a/config.tests/unix/libudev/libudev.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = libudev.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/mtdev/mtdev.cpp b/config.tests/unix/mtdev/mtdev.cpp
deleted file mode 100644
index bda6b06fda..0000000000
--- a/config.tests/unix/mtdev/mtdev.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Jolla Ltd, author: <robin.burchell@jollamobile.com>
-** 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 <mtdev.h>
-
-int main(int, char **)
-{
-    mtdev m;
-    mtdev_open(&m, 0);
-    return 0;
-}
diff --git a/config.tests/unix/mtdev/mtdev.pro b/config.tests/unix/mtdev/mtdev.pro
deleted file mode 100644
index 14111c6dc6..0000000000
--- a/config.tests/unix/mtdev/mtdev.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = mtdev.cpp
-
-CONFIG -= qt
diff --git a/config.tests/unix/mysql/mysql.cpp b/config.tests/unix/mysql/mysql.cpp
deleted file mode 100644
index 3f83cb1e68..0000000000
--- a/config.tests/unix/mysql/mysql.cpp
+++ /dev/null
@@ -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$
-**
-****************************************************************************/
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(WIN64) || defined(_WIN64) || defined(__WIN64__)
-#include <windows.h>
-#endif
-
-#include "mysql.h"
-
-int main(int, char **)
-{
-    mysql_get_client_version();
-    return 0;
-}
diff --git a/config.tests/unix/mysql/mysql.pro b/config.tests/unix/mysql/mysql.pro
deleted file mode 100644
index 745f9ee0fb..0000000000
--- a/config.tests/unix/mysql/mysql.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = mysql.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/objcopy/objcopy.cpp b/config.tests/unix/objcopy/objcopy.cpp
deleted file mode 100644
index 8e8ff43ae9..0000000000
--- a/config.tests/unix/objcopy/objcopy.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
-** 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$
-**
-****************************************************************************/
-
-int main()
-{
-    return 0;
-}
diff --git a/config.tests/unix/objcopy/objcopy.pro b/config.tests/unix/objcopy/objcopy.pro
deleted file mode 100644
index 3c76ae92ef..0000000000
--- a/config.tests/unix/objcopy/objcopy.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCES = objcopy.cpp
-CONFIG -= qt
-TARGET = objcopytest
-
-load(resolve_target)
-
-QMAKE_POST_LINK += $$QMAKE_OBJCOPY --only-keep-debug $$QMAKE_RESOLVED_TARGET objcopytest.debug && $$QMAKE_OBJCOPY --strip-debug $$QMAKE_RESOLVED_TARGET && $$QMAKE_OBJCOPY --add-gnu-debuglink=objcopytest.debug $$QMAKE_RESOLVED_TARGET
diff --git a/config.tests/unix/oci/oci.cpp b/config.tests/unix/oci/oci.cpp
deleted file mode 100644
index 0a73d06c7c..0000000000
--- a/config.tests/unix/oci/oci.cpp
+++ /dev/null
@@ -1,45 +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 <oci.h>
-
-int main(int, char **)
-{
-    return 0;
-}
diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro
deleted file mode 100644
index c9aec08ee0..0000000000
--- a/config.tests/unix/oci/oci.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = oci.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/odbc/odbc.cpp b/config.tests/unix/odbc/odbc.cpp
deleted file mode 100644
index fc36f121c4..0000000000
--- a/config.tests/unix/odbc/odbc.cpp
+++ /dev/null
@@ -1,51 +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$
-**
-****************************************************************************/
-
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(WIN64) || defined(_WIN64) || defined(__WIN64__)
-#include <windows.h>
-#endif
-#include <sql.h>
-#include <sqlext.h>
-
-int main(int, char **)
-{
-    SQLHANDLE env;
-    SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &env);
-    return 0;
-}
diff --git a/config.tests/unix/odbc/odbc.pro b/config.tests/unix/odbc/odbc.pro
deleted file mode 100644
index 6c72dc7b1c..0000000000
--- a/config.tests/unix/odbc/odbc.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = odbc.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/opengldesktop/opengldesktop.cpp b/config.tests/unix/opengldesktop/opengldesktop.cpp
deleted file mode 100644
index 0a5ce4e78c..0000000000
--- a/config.tests/unix/opengldesktop/opengldesktop.cpp
+++ /dev/null
@@ -1,55 +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$
-**
-****************************************************************************/
-
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#else
-#define GL_GLEXT_PROTOTYPES
-#include <GL/gl.h>
-#endif
-
-int main(int, char **)
-{
-    glBegin(GL_TRIANGLES);
-        glVertex2f(20.0f, 10.0f);
-        glVertex2f(10.0f, 30.0f);
-        glVertex2f(20.0f, 50.0f);
-    glEnd();
-    return 0;
-}
diff --git a/config.tests/unix/opengldesktop/opengldesktop.pro b/config.tests/unix/opengldesktop/opengldesktop.pro
deleted file mode 100644
index 7b53aa460d..0000000000
--- a/config.tests/unix/opengldesktop/opengldesktop.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = opengldesktop.cpp
-
-CONFIG -= qt
diff --git a/config.tests/unix/opengles2/opengles2.cpp b/config.tests/unix/opengles2/opengles2.cpp
deleted file mode 100644
index 39a48dcf29..0000000000
--- a/config.tests/unix/opengles2/opengles2.cpp
+++ /dev/null
@@ -1,53 +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$
-**
-****************************************************************************/
-
-#ifdef __APPLE__
-  #include <OpenGLES/ES2/gl.h>
-#else
-  #define GL_GLEXT_PROTOTYPES
-  #include <GLES2/gl2.h>
-#endif
-
-int main(int, char **)
-{
-    glUniform1f(1, GLfloat(1.0));
-    glClear(GL_COLOR_BUFFER_BIT);
-
-    return 0;
-}
diff --git a/config.tests/unix/opengles2/opengles2.pro b/config.tests/unix/opengles2/opengles2.pro
deleted file mode 100644
index 15e4ce3ca0..0000000000
--- a/config.tests/unix/opengles2/opengles2.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = opengles2.cpp
-
-CONFIG -= qt
diff --git a/config.tests/unix/opengles3/opengles3.cpp b/config.tests/unix/opengles3/opengles3.cpp
deleted file mode 100644
index 7bcfc0e4bc..0000000000
--- a/config.tests/unix/opengles3/opengles3.cpp
+++ /dev/null
@@ -1,56 +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$
-**
-****************************************************************************/
-
-#ifdef __APPLE__
-  #include <OpenGLES/ES3/gl.h>
-#else
-  #define GL_GLEXT_PROTOTYPES
-  #include <GLES3/gl3.h>
-#endif
-
-int main(int, char **)
-{
-    glGetStringi(GL_EXTENSIONS, 0);
-    glReadBuffer(GL_COLOR_ATTACHMENT1);
-    static GLfloat f[6];
-    glUniformMatrix2x3fv(0, 0, GL_FALSE, f);
-    glMapBufferRange(GL_ARRAY_BUFFER, 0, 0, GL_MAP_READ_BIT);
-
-    return 0;
-}
diff --git a/config.tests/unix/opengles3/opengles3.pro b/config.tests/unix/opengles3/opengles3.pro
deleted file mode 100644
index dc62f7856a..0000000000
--- a/config.tests/unix/opengles3/opengles3.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-# The library is expected to be the same as in ES 2.0 (libGLESv2).
-# The difference is the header and the presence of the functions in
-# the library.
-
-SOURCES = opengles3.cpp
-
-CONFIG -= qt
diff --git a/config.tests/unix/opengles31/opengles31.cpp b/config.tests/unix/opengles31/opengles31.cpp
deleted file mode 100644
index dbc7eb3b29..0000000000
--- a/config.tests/unix/opengles31/opengles31.cpp
+++ /dev/null
@@ -1,48 +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 <GLES3/gl31.h>
-
-int main(int, char **)
-{
-    glDispatchCompute(1, 1, 1);
-    glProgramUniform1i(0, 0, 0);
-
-    return 0;
-}
diff --git a/config.tests/unix/opengles31/opengles31.pro b/config.tests/unix/opengles31/opengles31.pro
deleted file mode 100644
index 7895be9efc..0000000000
--- a/config.tests/unix/opengles31/opengles31.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-# The library is expected to be the same as in ES 2.0 (libGLESv2).
-# The difference is the header and the presence of the functions in
-# the library.
-
-SOURCES = opengles31.cpp
-
-CONFIG -= qt
diff --git a/config.tests/unix/openvg/openvg.cpp b/config.tests/unix/openvg/openvg.cpp
deleted file mode 100644
index f9cf7786ab..0000000000
--- a/config.tests/unix/openvg/openvg.cpp
+++ /dev/null
@@ -1,49 +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 <VG/openvg.h>
-
-
-int main(int, char **)
-{
-    VGint i;
-    i = 2;
-    vgFlush();
-    return 0;
-}
diff --git a/config.tests/unix/openvg/openvg.pro b/config.tests/unix/openvg/openvg.pro
deleted file mode 100644
index 1933e3789c..0000000000
--- a/config.tests/unix/openvg/openvg.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES += openvg.cpp
-
-CONFIG -= qt
diff --git a/config.tests/unix/pcre2/pcre2.cpp b/config.tests/unix/pcre2/pcre2.cpp
deleted file mode 100644
index 9c94d29999..0000000000
--- a/config.tests/unix/pcre2/pcre2.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-** 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$
-**
-****************************************************************************/
-
-#define PCRE2_CODE_UNIT_WIDTH 16
-
-#include <pcre2.h>
-
-#if (PCRE2_MAJOR < 10) || ((PCRE2_MAJOR == 10) && (PCRE2_MINOR < 20))
-#error This PCRE version is not supported
-#endif
-
-int main(int, char **)
-{
-    return 0;
-}
-
diff --git a/config.tests/unix/pcre2/pcre2.pro b/config.tests/unix/pcre2/pcre2.pro
deleted file mode 100644
index 6a3fc275bc..0000000000
--- a/config.tests/unix/pcre2/pcre2.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = pcre2.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/poll/poll.cpp b/config.tests/unix/poll/poll.cpp
deleted file mode 100644
index ad33900a63..0000000000
--- a/config.tests/unix/poll/poll.cpp
+++ /dev/null
@@ -1,51 +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 <poll.h>
-
-int main()
-{
-    struct pollfd pfd;
-
-    pfd.fd = -1;
-    pfd.events = 0;
-    pfd.revents = 0;
-
-    return ::poll(&pfd, 1, 0);
-}
diff --git a/config.tests/unix/poll/poll.pro b/config.tests/unix/poll/poll.pro
deleted file mode 100644
index 70121b4586..0000000000
--- a/config.tests/unix/poll/poll.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = poll.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/pollts/pollts.cpp b/config.tests/unix/pollts/pollts.cpp
deleted file mode 100644
index ce5db6a37b..0000000000
--- a/config.tests/unix/pollts/pollts.cpp
+++ /dev/null
@@ -1,57 +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 <poll.h>
-#include <signal.h>
-#include <time.h>
-
-int main()
-{
-    struct pollfd pfd;
-    struct timespec ts;
-
-    pfd.fd = -1;
-    pfd.events = 0;
-    pfd.revents = 0;
-
-    ts.tv_sec = 0;
-    ts.tv_nsec = 0;
-
-    return ::pollts(&pfd, 1, &ts, nullptr);
-}
diff --git a/config.tests/unix/pollts/pollts.pro b/config.tests/unix/pollts/pollts.pro
deleted file mode 100644
index 5109dc33fd..0000000000
--- a/config.tests/unix/pollts/pollts.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = pollts.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/posix_fallocate/posix_fallocate.cpp b/config.tests/unix/posix_fallocate/posix_fallocate.cpp
deleted file mode 100644
index ce1286813a..0000000000
--- a/config.tests/unix/posix_fallocate/posix_fallocate.cpp
+++ /dev/null
@@ -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 <fcntl.h>
-// NetBSD 7 has posix_fallocate, but in unistd.h instead of fcntl.h
-#ifdef __NetBSD__
-# include <unistd.h>
-#endif
-
-int main(int, char **)
-{
-    return ::posix_fallocate(0, 0, 0);
-}
diff --git a/config.tests/unix/posix_fallocate/posix_fallocate.pro b/config.tests/unix/posix_fallocate/posix_fallocate.pro
deleted file mode 100644
index f01b15f3d7..0000000000
--- a/config.tests/unix/posix_fallocate/posix_fallocate.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = posix_fallocate.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/ppoll/ppoll.cpp b/config.tests/unix/ppoll/ppoll.cpp
deleted file mode 100644
index 9e065afadc..0000000000
--- a/config.tests/unix/ppoll/ppoll.cpp
+++ /dev/null
@@ -1,56 +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 <signal.h>
-#include <poll.h>
-
-int main()
-{
-    struct pollfd pfd;
-    struct timespec ts;
-
-    pfd.fd = -1;
-    pfd.events = 0;
-    pfd.revents = 0;
-
-    ts.tv_sec = 0;
-    ts.tv_nsec = 0;
-
-    return ::ppoll(&pfd, 1, &ts, nullptr);
-}
diff --git a/config.tests/unix/ppoll/ppoll.pro b/config.tests/unix/ppoll/ppoll.pro
deleted file mode 100644
index d08a8a0679..0000000000
--- a/config.tests/unix/ppoll/ppoll.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = ppoll.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/pps/pps.cpp b/config.tests/unix/pps/pps.cpp
deleted file mode 100644
index fba0673bf1..0000000000
--- a/config.tests/unix/pps/pps.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
-** 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 <sys/pps.h>
-
-int main(int, char **)
-{
-    pps_decoder_t decoder;
-
-    pps_decoder_initialize(&decoder, NULL);
-    return 0;
-}
diff --git a/config.tests/unix/pps/pps.pro b/config.tests/unix/pps/pps.pro
deleted file mode 100644
index af9b339f97..0000000000
--- a/config.tests/unix/pps/pps.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = pps.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/psql/psql.cpp b/config.tests/unix/psql/psql.cpp
deleted file mode 100644
index 8d40d84c9e..0000000000
--- a/config.tests/unix/psql/psql.cpp
+++ /dev/null
@@ -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 "libpq-fe.h"
-
-int main(int, char **)
-{
-    PQescapeBytea(0, 0, 0);
-    PQunescapeBytea(0, 0);
-    return 0;
-}
diff --git a/config.tests/unix/psql/psql.pro b/config.tests/unix/psql/psql.pro
deleted file mode 100644
index dae7375be5..0000000000
--- a/config.tests/unix/psql/psql.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = psql.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/qqnx_imf/qqnx_imf.cpp b/config.tests/unix/qqnx_imf/qqnx_imf.cpp
deleted file mode 100644
index 5af5fb627c..0000000000
--- a/config.tests/unix/qqnx_imf/qqnx_imf.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
-** 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 "imf/imf_client.h"
-
-int main(int, char **)
-{
-    imf_client_init();
-    return 0;
-}
diff --git a/config.tests/unix/qqnx_imf/qqnx_imf.pro b/config.tests/unix/qqnx_imf/qqnx_imf.pro
deleted file mode 100644
index e1a2d9cecb..0000000000
--- a/config.tests/unix/qqnx_imf/qqnx_imf.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = qqnx_imf.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/reduce_exports/fvisibility.c b/config.tests/unix/reduce_exports/fvisibility.c
deleted file mode 100644
index 12055ead46..0000000000
--- a/config.tests/unix/reduce_exports/fvisibility.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the configuration 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$
-**
-****************************************************************************/
-
-#if defined(__GNUC__)
-__attribute((visibility("default"))) void blah();
-#elif defined(__SUNPRO_CC)
-__global void blah();
-#else
-#   error "GCC4+ or SunStudio 8+ are required to support ELF visibility"
-#endif
diff --git a/config.tests/unix/reduce_exports/reduce_exports.pro b/config.tests/unix/reduce_exports/reduce_exports.pro
deleted file mode 100644
index dc8adc2637..0000000000
--- a/config.tests/unix/reduce_exports/reduce_exports.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = lib
-CONFIG += dll hide_symbols
-SOURCES = fvisibility.c
-
-isEmpty(QMAKE_CFLAGS_HIDESYMS): error("Nope")
diff --git a/config.tests/unix/reduce_relocs/bsymbolic_functions.c b/config.tests/unix/reduce_relocs/bsymbolic_functions.c
deleted file mode 100644
index 36ff410c81..0000000000
--- a/config.tests/unix/reduce_relocs/bsymbolic_functions.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the configuration 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$
-**
-****************************************************************************/
-
-#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; }
diff --git a/config.tests/unix/reduce_relocs/reduce_relocs.pro b/config.tests/unix/reduce_relocs/reduce_relocs.pro
deleted file mode 100644
index 2f23465a3f..0000000000
--- a/config.tests/unix/reduce_relocs/reduce_relocs.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = lib
-CONFIG += dll bsymbolic_functions
-SOURCES = bsymbolic_functions.c
-
-isEmpty(QMAKE_LFLAGS_BSYMBOLIC_FUNC): error("Nope")
diff --git a/config.tests/unix/sctp/sctp.cpp b/config.tests/unix/sctp/sctp.cpp
deleted file mode 100644
index 61c33d5fc5..0000000000
--- a/config.tests/unix/sctp/sctp.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Alex Trotsenko <alex1973tr@gmail.com>
-** 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$
-**
-****************************************************************************/
-
-/*
-   Sample program for configure to test for SCTP sockets support
-   on target platforms.
-*/
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/sctp.h>
-
-int main()
-{
-    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
deleted file mode 100644
index 2138254732..0000000000
--- a/config.tests/unix/sctp/sctp.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = sctp.cpp
-CONFIG -= qt
-QT =
diff --git a/config.tests/unix/slog2/slog2.cpp b/config.tests/unix/slog2/slog2.cpp
deleted file mode 100644
index 351829ea99..0000000000
--- a/config.tests/unix/slog2/slog2.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 - 2012 Research In Motion
-** 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 <slog2.h>
-
-int main(int, char **)
-{
-    slog2_set_default_buffer((slog2_buffer_t)-1);
-    return 0;
-}
diff --git a/config.tests/unix/slog2/slog2.pro b/config.tests/unix/slog2/slog2.pro
deleted file mode 100644
index 269a88a383..0000000000
--- a/config.tests/unix/slog2/slog2.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = slog2.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/sqlite/sqlite.cpp b/config.tests/unix/sqlite/sqlite.cpp
deleted file mode 100644
index dd17f74101..0000000000
--- a/config.tests/unix/sqlite/sqlite.cpp
+++ /dev/null
@@ -1,46 +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 <sqlite3.h>
-
-int main(int, char **)
-{
-    sqlite3_open_v2(0, 0, 0, 0);
-    return 0;
-}
diff --git a/config.tests/unix/sqlite/sqlite.pro b/config.tests/unix/sqlite/sqlite.pro
deleted file mode 100644
index 4b24e014ba..0000000000
--- a/config.tests/unix/sqlite/sqlite.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = sqlite.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/sqlite2/sqlite2.cpp b/config.tests/unix/sqlite2/sqlite2.cpp
deleted file mode 100644
index 1c1058052a..0000000000
--- a/config.tests/unix/sqlite2/sqlite2.cpp
+++ /dev/null
@@ -1,45 +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 <sqlite.h>
-
-int main(int, char **)
-{
-    return 0;
-}
diff --git a/config.tests/unix/sqlite2/sqlite2.pro b/config.tests/unix/sqlite2/sqlite2.pro
deleted file mode 100644
index b1252721dc..0000000000
--- a/config.tests/unix/sqlite2/sqlite2.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = sqlite2.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/stack-protector/stack-protector.cpp b/config.tests/unix/stack-protector/stack-protector.cpp
deleted file mode 100644
index 8b3926fe1f..0000000000
--- a/config.tests/unix/stack-protector/stack-protector.cpp
+++ /dev/null
@@ -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$
-**
-****************************************************************************/
-
-#if defined(__QNXNTO__)
-#include <sys/neutrino.h>
-
-#if _NTO_VERSION < 700
-#error stack-protector not used (by default) before QNX 7.0.0.
-#endif
-
-#endif
-
-int main()
-{
-    return 0;
-}
diff --git a/config.tests/unix/stack-protector/stack-protector.pro b/config.tests/unix/stack-protector/stack-protector.pro
deleted file mode 100644
index ac84d7f148..0000000000
--- a/config.tests/unix/stack-protector/stack-protector.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = stack-protector.cpp
-QMAKE_CXXFLAGS += -fstack-protector-strong
diff --git a/config.tests/unix/syslog/syslog.c b/config.tests/unix/syslog/syslog.c
deleted file mode 100644
index aaf0fe7509..0000000000
--- a/config.tests/unix/syslog/syslog.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Tasuku Suzuki <stasuku@gmail.com>
-** 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 <syslog.h>
-
-int main(int argc, char **argv)
-{
-    openlog("qt", 0, LOG_USER);
-    syslog(LOG_INFO, "configure");
-    closelog();
-    return 0;
-}
diff --git a/config.tests/unix/syslog/syslog.pro b/config.tests/unix/syslog/syslog.pro
deleted file mode 100644
index abe8cc9cd7..0000000000
--- a/config.tests/unix/syslog/syslog.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = syslog.c
-
-CONFIG -= qt
diff --git a/config.tests/unix/tds/tds.cpp b/config.tests/unix/tds/tds.cpp
deleted file mode 100644
index 9d595154b7..0000000000
--- a/config.tests/unix/tds/tds.cpp
+++ /dev/null
@@ -1,46 +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 <sybfront.h>
-#include <sybdb.h>
-
-int main(int, char **)
-{
-    return 0;
-}
diff --git a/config.tests/unix/tds/tds.pro b/config.tests/unix/tds/tds.pro
deleted file mode 100644
index f60fc0a602..0000000000
--- a/config.tests/unix/tds/tds.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = tds.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/tslib/tslib.cpp b/config.tests/unix/tslib/tslib.cpp
deleted file mode 100644
index 7afb07aa66..0000000000
--- a/config.tests/unix/tslib/tslib.cpp
+++ /dev/null
@@ -1,46 +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 <tslib.h>
-
-int main()
-{
-    ts_open("foo", 0);
-    return 0;
-}
diff --git a/config.tests/unix/tslib/tslib.pro b/config.tests/unix/tslib/tslib.pro
deleted file mode 100644
index 6fc652dd96..0000000000
--- a/config.tests/unix/tslib/tslib.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = tslib.cpp
-CONFIG -= qt 
diff --git a/config.tests/unix/xkbcommon/xkbcommon.cpp b/config.tests/unix/xkbcommon/xkbcommon.cpp
deleted file mode 100644
index f13b4f721a..0000000000
--- a/config.tests/unix/xkbcommon/xkbcommon.cpp
+++ /dev/null
@@ -1,48 +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 <xkbcommon/xkbcommon.h>
-#include <xkbcommon/xkbcommon-keysyms.h>
-#include <xkbcommon/xkbcommon-names.h>
-
-int main()
-{
-    xkb_context_new(XKB_CONTEXT_NO_FLAGS);
-    return 0;
-}
diff --git a/config.tests/unix/xkbcommon/xkbcommon.pro b/config.tests/unix/xkbcommon/xkbcommon.pro
deleted file mode 100644
index 4bc6e493b2..0000000000
--- a/config.tests/unix/xkbcommon/xkbcommon.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = xkbcommon.cpp
-CONFIG -= qt
diff --git a/config.tests/unix/zlib/zlib.cpp b/config.tests/unix/zlib/zlib.cpp
deleted file mode 100644
index 3908e59c36..0000000000
--- a/config.tests/unix/zlib/zlib.cpp
+++ /dev/null
@@ -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 <zlib.h>
-
-int main(int, char **)
-{
-    z_streamp stream;
-    stream = 0;
-    const char *ver = zlibVersion();
-    ver = 0;
-    // compress2 was added in zlib version 1.0.8
-    int res = compress2(0, 0, 0, 0, 1);
-    res = 0;
-    return 0;
-}
diff --git a/config.tests/unix/zlib/zlib.pro b/config.tests/unix/zlib/zlib.pro
deleted file mode 100644
index 6a6b324611..0000000000
--- a/config.tests/unix/zlib/zlib.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = zlib.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/win/directwrite/directwrite.cpp b/config.tests/win/directwrite/directwrite.cpp
deleted file mode 100644
index 8380c703ad..0000000000
--- a/config.tests/win/directwrite/directwrite.cpp
+++ /dev/null
@@ -1,50 +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 <dwrite.h>
-#include <d2d1.h>
-
-int main(int, char**)
-{
-    IDWriteFactory *factory = 0;
-    DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED,
-                        __uuidof(IDWriteFactory),
-                        reinterpret_cast<IUnknown **>(&factory));
-    return 0;
-}
diff --git a/config.tests/win/directwrite/directwrite.pro b/config.tests/win/directwrite/directwrite.pro
deleted file mode 100644
index 88ff6ee2b8..0000000000
--- a/config.tests/win/directwrite/directwrite.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = directwrite.cpp
-CONFIG -= qt
-CONFIG += console
diff --git a/config.tests/win/directwrite2/directwrite2.cpp b/config.tests/win/directwrite2/directwrite2.cpp
deleted file mode 100644
index 65fa9d44cd..0000000000
--- a/config.tests/win/directwrite2/directwrite2.cpp
+++ /dev/null
@@ -1,51 +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 <dwrite_2.h>
-#include <d2d1.h>
-
-int main(int, char**)
-{
-    IUnknown *factory = 0;
-    const size_t dummy = size_t(DWRITE_E_NOCOLOR) + sizeof(IDWriteFontFace2);
-    DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED,
-                        __uuidof(IDWriteFactory2),
-                        &factory);
-    return 0;
-}
diff --git a/config.tests/win/directwrite2/directwrite2.pro b/config.tests/win/directwrite2/directwrite2.pro
deleted file mode 100644
index 5d6fe24a4b..0000000000
--- a/config.tests/win/directwrite2/directwrite2.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = directwrite2.cpp
-CONFIG -= qt
-CONFIG += console
diff --git a/config.tests/x11/xinput2/xinput2.cpp b/config.tests/x11/xinput2/xinput2.cpp
deleted file mode 100644
index 4cdac72945..0000000000
--- a/config.tests/x11/xinput2/xinput2.cpp
+++ /dev/null
@@ -1,73 +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/XInput2.h>
-#include <X11/extensions/Xge.h>
-
-#ifndef XInput_2_0
-#  error "Missing XInput_2_0 #define"
-#endif
-
-int main(int, char **)
-{
-    // need XGenericEventCookie for XInput2 to work
-    Display *dpy = 0;
-    XEvent xevent;
-    if (XGetEventData(dpy, &xevent.xcookie)) {
-        XFreeEventData(dpy, &xevent.xcookie);
-    }
-
-    XIEvent *xievent;
-    xievent = 0;
-
-    XIDeviceEvent *xideviceevent;
-    xideviceevent = 0;
-
-    XIHierarchyEvent *xihierarchyevent;
-    xihierarchyevent = 0;
-
-    int deviceid = 0;
-    int len = 0;
-    Atom *atoms = XIListProperties(dpy, deviceid, &len);
-    if (atoms)
-        XFree(atoms);
-
-    return 0;
-}
diff --git a/config.tests/x11/xinput2/xinput2.pro b/config.tests/x11/xinput2/xinput2.pro
deleted file mode 100644
index 4788f0e14b..0000000000
--- a/config.tests/x11/xinput2/xinput2.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG += x11
-CONFIG -= qt
-SOURCES = xinput2.cpp
diff --git a/config.tests/x11/xlib/xlib.cpp b/config.tests/x11/xlib/xlib.cpp
deleted file mode 100644
index 6743847335..0000000000
--- a/config.tests/x11/xlib/xlib.cpp
+++ /dev/null
@@ -1,48 +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>
-
-int main(int, char **)
-{
-    Display *d = XOpenDisplay(NULL);
-    XCloseDisplay(d);
-    return 0;
-}
-
diff --git a/config.tests/x11/xlib/xlib.pro b/config.tests/x11/xlib/xlib.pro
deleted file mode 100644
index 658161ed9d..0000000000
--- a/config.tests/x11/xlib/xlib.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG += x11
-CONFIG -= qt
-SOURCES = xlib.cpp
diff --git a/configure.json b/configure.json
index b7f767e2ec..80278b3b69 100644
--- a/configure.json
+++ b/configure.json
@@ -147,7 +147,14 @@
     "libraries": {
         "zlib": {
             "label": "zlib",
-            "test": "unix/zlib",
+            "test": {
+                "include": "zlib.h",
+                "main": [
+                    "z_streamp stream = 0;",
+                    "(void) zlibVersion();",
+                    "(void) compress2(0, 0, 0, 0, 1);  // compress2 was added in zlib version 1.0.8"
+                ]
+            },
             "sources": [
                 { "libs": "-lzdll", "condition": "config.msvc" },
                 { "libs": "-lz", "condition": "!config.msvc" }
@@ -155,7 +162,17 @@
         },
         "dbus": {
             "label": "D-Bus >= 1.2",
-            "test": "unix/dbus",
+            "test": {
+                "include": "dbus/dbus.h",
+                "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);",
+                "qmake": [
+                    "CONFIG += build_all",
+                    "CONFIG(debug, debug|release): \\",
+                    "    LIBS += $$LIBS_DEBUG",
+                    "else: \\",
+                    "    LIBS += $$LIBS_RELEASE"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "dbus-1 >= 1.2" },
                 {
@@ -179,7 +196,10 @@
         },
         "libudev": {
             "label": "udev",
-            "test": "unix/libudev",
+            "test": {
+                "include": "libudev.h",
+                "main": "udev_unref(udev_new());"
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "libudev" },
                 "-ludev"
@@ -241,12 +261,31 @@
         "c++14": {
             "label": "C++14 support",
             "type": "compile",
-            "test": "common/c++14"
+            "test": {
+                "head": [
+                    "#if __cplusplus > 201103L",
+                    "// Compiler claims to support C++14, trust it",
+                    "#else",
+                    "#  error __cplusplus must be > 201103L (the value of C++11)",
+                    "#endif"
+                ],
+                "qmake": "CONFIG += c++11 c++14"
+            }
         },
         "c++1z": {
             "label": "C++1z support",
             "type": "compile",
-            "test": "common/c++1z"
+            "test": {
+                "head": [
+                    "#if __cplusplus > 201402L",
+                    "// Compiler claims to support experimental C++1z, trust it",
+                    "#else",
+                    "#  error __cplusplus must be > 201402L (the value for C++14)",
+                    "#endif",
+                    "#include <map>  // https://bugs.llvm.org//show_bug.cgi?id=33117"
+                ],
+                "qmake": "CONFIG += c++11 c++14 c++1z"
+            }
         },
         "precompile_header": {
             "label": "precompiled header support",
@@ -271,12 +310,38 @@
         "reduce_exports": {
             "label": "symbol visibility support",
             "type": "compile",
-            "test": "unix/reduce_exports"
+            "test": {
+                "head": [
+                    "#if defined(__GNUC__)",
+                    "__attribute((visibility(\"default\")))",
+                    "#elif defined(__SUNPRO_CC)",
+                    "__global",
+                    "#else",
+                    "#  error GCC4+ or SunStudio 8+ are required to support ELF visibility",
+                    "#endif"
+                ],
+                "qmake": [
+                    "TEMPLATE = lib",
+                    "CONFIG += dll hide_symbols",
+                    "isEmpty(QMAKE_CFLAGS_HIDESYMS): error(\"Nope\")"
+                ]
+            }
         },
         "reduce_relocations": {
             "label": "-Bsymbolic-functions support",
             "type": "compile",
-            "test": "unix/reduce_relocs"
+            "test": {
+                "head": [
+                    "#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"
+                ],
+                "qmake": [
+                    "TEMPLATE = lib",
+                    "CONFIG += dll bsymbolic_functions",
+                    "isEmpty(QMAKE_LFLAGS_BSYMBOLIC_FUNC): error(\"Nope\")"
+                ]
+            }
         },
         "build_parts": {
             "type": "buildParts"
@@ -284,47 +349,150 @@
         "separate_debug_info": {
             "label": "separate debug information support",
             "type": "compile",
-            "test": "unix/objcopy"
+            "test": {
+                "qmake": [
+                    "TARGET = objcopytest",
+                    "load(resolve_target)",
+                    "QMAKE_POST_LINK += \\",
+                    "    $$QMAKE_OBJCOPY --only-keep-debug $$QMAKE_RESOLVED_TARGET objcopytest.debug && \\",
+                    "    $$QMAKE_OBJCOPY --strip-debug $$QMAKE_RESOLVED_TARGET && \\",
+                    "    $$QMAKE_OBJCOPY --add-gnu-debuglink=objcopytest.debug $$QMAKE_RESOLVED_TARGET"
+                ]
+            }
         },
         "sse2": {
             "label": "SSE2 instructions",
             "type": "compile",
-            "test": "common/sse2"
+            "test": {
+                "include": "emmintrin.h",
+                "main": [
+                    "__m128i a = _mm_setzero_si128();",
+                    "_mm_maskmoveu_si128(a, _mm_setzero_si128(), 0);"
+                ],
+                "qmake": [
+                    "!defined(QMAKE_CFLAGS_SSE2, var): error(\"This compiler does not support SSE2\")",
+                    "QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE2"
+                ]
+            }
         },
         "sse3": {
             "label": "SSE3 instructions",
             "type": "compile",
-            "test": "common/sse3"
+            "test": {
+                "include": "pmmintrin.h",
+                "main": [
+                    "__m128d a = _mm_set1_pd(6.28);",
+                    "__m128d b = _mm_set1_pd(3.14);",
+                    "__m128d result = _mm_addsub_pd(a, b);",
+                    "(void) _mm_movedup_pd(result);"
+                ],
+                "qmake": [
+                    "!defined(QMAKE_CFLAGS_SSE3, var): error(\"This compiler does not support SSE3\")",
+                    "QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE3"
+                ]
+            }
         },
         "ssse3": {
             "label": "SSSE3 instructions",
             "type": "compile",
-            "test": "common/ssse3"
+            "test": {
+                "include": "tmmintrin.h",
+                "main": [
+                    "__m128i a = _mm_set1_epi32(42);",
+                    "_mm_abs_epi8(a);",
+                    "(void) _mm_sign_epi16(a, _mm_set1_epi32(64));"
+                ],
+                "qmake": [
+                    "!defined(QMAKE_CFLAGS_SSSE3, var): error(\"This compiler does not support SSSE3\")",
+                    "QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSSE3"
+                ]
+            }
         },
         "sse4_1": {
             "label": "SSE4.1 instructions",
             "type": "compile",
-            "test": "common/sse4_1"
+            "test": {
+                "include": "smmintrin.h",
+                "main": [
+                    "__m128 a = _mm_setzero_ps();",
+                    "_mm_ceil_ps(a);",
+                    "__m128i result = _mm_mullo_epi32(_mm_set1_epi32(42), _mm_set1_epi32(64));",
+                    "(void)result;"
+                ],
+                "qmake": [
+                    "!defined(QMAKE_CFLAGS_SSE4_1, var): error(\"This compiler does not support SSE4.1\")",
+                    "QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE4_1"
+                ]
+            }
         },
         "sse4_2": {
             "label": "SSE4.2 instructions",
             "type": "compile",
-            "test": "common/sse4_2"
+            "test": {
+                "include": "nmmintrin.h",
+                "main": [
+                    "__m128i a = _mm_setzero_si128();",
+                    "__m128i b = _mm_set1_epi32(42);",
+                    "(void) _mm_cmpestrm(a, 16, b, 16, 0);"
+                ],
+                "qmake": [
+                    "!defined(QMAKE_CFLAGS_SSE4_2, var): error(\"This compiler does not support SSE4.2\")",
+                    "QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE4_2"
+                ]
+            }
         },
         "f16c": {
             "label": "F16C instructions",
             "type": "compile",
-            "test": "common/f16c"
+            "test": {
+                "include": "immintrin.h",
+                "main": [
+                    "__m128i a = _mm_setzero_si128();",
+                    "__m128 b = _mm_cvtph_ps(a);",
+                    "__m256 b256 = _mm256_cvtph_ps(a);",
+                    "(void) _mm_cvtps_ph(b, 0);",
+                    "(void) _mm256_cvtps_ph(b256, 0);"
+                ],
+                "qmake": [
+                    "!defined(QMAKE_CFLAGS_F16C, var): error(\"This compiler does not support F16C\")",
+                    "QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_F16C"
+                ]
+            }
         },
         "avx": {
             "label": "AVX instructions",
             "type": "compile",
-            "test": "common/avx"
+            "test": {
+                "include": "immintrin.h",
+                "main": [
+                    "__m256d a = _mm256_setzero_pd();",
+                    "__m256d b = _mm256_set1_pd(42.42);",
+                    "(void) _mm256_add_pd(a, b);"
+                ],
+                "qmake": [
+                    "!defined(QMAKE_CFLAGS_AVX, var): error(\"This compiler does not support AVX\")",
+                    "QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX"
+                ]
+            }
         },
         "avx2": {
             "label": "AVX2 instructions",
             "type": "compile",
-            "test": "common/avx2"
+            "test": {
+                "include": "immintrin.h",
+                "main": [
+                    "// AVX",
+                    "_mm256_zeroall();",
+                    "__m256i a = _mm256_setzero_si256();",
+                    "// AVX2",
+                    "__m256i b = _mm256_and_si256(a, a);",
+                    "(void) _mm256_add_epi8(a, b);"
+                ],
+                "qmake": [
+                    "!defined(QMAKE_CFLAGS_AVX2, var): error(\"This compiler does not support AVX2\")",
+                    "QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX2"
+                ]
+            }
         },
         "avx512f": {
             "label": "AVX512 F instructions",
@@ -395,33 +563,58 @@
             "type": "subarch",
             "subarch": "neon"
         },
-
         "posix_fallocate": {
             "label": "POSIX fallocate()",
             "type": "compile",
-            "test": "unix/posix_fallocate"
+            "test": {
+                "include": [ "fcntl.h", "unistd.h" ],
+                "main": "(void) posix_fallocate(0, 0, 0);"
+            }
         },
         "alloca_stdlib_h": {
             "label": "alloca() in stdlib.h",
             "type": "compile",
-            "test": "common/alloca"
+            "test": {
+                "include": "stdlib.h",
+                "main": "alloca(1);"
+            }
         },
         "alloca_h": {
             "label": "alloca() in alloca.h",
             "type": "compile",
-            "test": "common/alloca",
-            "args": "DEFINES+=USE_ALLOCA_H"
+            "test": {
+                "include": "alloca.h",
+                "tail": [
+                    "#ifdef __QNXNTO__",
+                    "// extra include needed in QNX7 to define NULL for the alloca() macro",
+                    "#  include <stddef.h>",
+                    "#endif"
+                ],
+                "main": "alloca(1);"
+            }
         },
         "alloca_malloc_h": {
             "label": "alloca() in malloc.h",
             "type": "compile",
-            "test": "common/alloca",
-            "args": "DEFINES+=USE_MALLOC_H"
+            "test": {
+                "include": "malloc.h",
+                "main": "alloca(1);"
+            }
         },
         "stack_protector": {
             "label": "stack protection",
             "type": "compile",
-            "test": "unix/stack-protector"
+            "test": {
+                "head": [
+                    "#ifdef __QNXNTO__",
+                    "#  include <sys/neutrino.h>",
+                    "#  if _NTO_VERSION < 700",
+                    "#    error stack-protector not used (by default) before QNX 7.0.0.",
+                    "#  endif",
+                    "#endif"
+                ],
+                "qmake": "QMAKE_CXXFLAGS += -fstack-protector-strong"
+            }
         },
         "incredibuild_xge": {
             "label": "IncrediBuild",
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 4b2ba560fb..c3ea334dd8 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -733,7 +733,7 @@ defineTest(qtConfHandleLibrary) {
         }
 
         # if the library defines a test, use it to verify the source.
-        !isEmpty($${lpfx}.test) {
+        !isEmpty($${lpfx}.test)|!isEmpty($${lpfx}.test._KEYS_) {
             $${lpfx}.literal_args = $$qtConfLibraryArgs($$spfx) $$use_args
             $${lpfx}.host = $$eval($${spfx}.host)
             !qtConfTest_compile($$lpfx) {
@@ -855,16 +855,58 @@ defineTest(qtConfTestPrepare_compile) {
     return(true)
 }
 
+defineTest(qtConfPrepareCompileTestSource) {
+    test_dir = $$2
+
+    # Create source code
+    contents = "/* Generated by configure */"
+    # Custom code before includes
+    for (ent, $$qtConfScalarOrList($${1}.head)): \
+        contents += $$ent
+    # Includes
+    for (ent, $$qtConfScalarOrList($${1}.include)): \
+        contents += "$${LITERAL_HASH}include <$$ent>"
+    # Custom code after includes
+    for (ent, $$qtConfScalarOrList($${1}.tail)): \
+        contents += $$ent
+    # And finally the custom code inside main()
+    contents += \
+        "int main(int argc, char **argv)" \
+        "{" \
+        "    (void)argc; (void)argv;" \
+        "    /* BEGIN TEST: */"
+    for (ent, $$qtConfScalarOrList($${1}.main)): \
+        contents += "    $$ent"
+    contents += \
+        "    /* END TEST */" \
+        "    return 0;" \
+        "}"
+    write_file($$test_dir/main.cpp, contents)|error()
+
+    # Create stub .pro file
+    contents = "SOURCES = main.cpp"
+    # Custom project code
+    for (ent, $$qtConfScalarOrList($${1}.qmake)): \
+        contents += $$ent
+    write_file($$test_dir/$$basename(test_dir).pro, contents)|error()
+}
+
 defineTest(qtConfTest_compile) {
     test = $$eval($${1}.test)
     host = $$eval($${1}.host)
     isEmpty(host): host = false
 
-    test_dir = $$QMAKE_CONFIG_TESTS_DIR/$$test
     test_base_out_dir = $$OUT_PWD/$$basename(QMAKE_CONFIG_TESTS_DIR)
-    test_out_dir = $$test_base_out_dir/$$test
-    !isEmpty($${1}.pro): \
-        test_dir = $$test_dir/$$eval($${1}.pro)
+    isEmpty(test) {
+        test_dir = $$test_base_out_dir/$$section(1, ".", -1)
+        test_out_dir = $$test_dir
+        qtConfPrepareCompileTestSource($${1}.test, $$test_dir)
+    } else {
+        test_dir = $$QMAKE_CONFIG_TESTS_DIR/$$test
+        test_out_dir = $$test_base_out_dir/$$test
+        !isEmpty($${1}.pro): \
+            test_dir = $$test_dir/$$eval($${1}.pro)
+    }
     test_cmd_base = "$$QMAKE_CD $$system_quote($$system_path($$test_out_dir)) &&"
 
     qmake_args = $$qtConfPkgConfigEnv()$$system_quote($$system_path($$QMAKE_QMAKE))
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index 67a1a2ad4b..5596280250 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -22,14 +22,26 @@
     "libraries": {
         "doubleconversion": {
             "label": "DoubleConversion",
-            "test": "unix/doubleconversion",
+            "test": {
+                "include": "double-conversion/double-conversion.h",
+                "main": "(void) double_conversion::StringToDoubleConverter::NO_FLAGS;"
+            },
             "sources": [
                 "-ldouble-conversion"
             ]
         },
         "glib": {
             "label": "GLib",
-            "test": "unix/glib",
+            "test": {
+                "head": "typedef struct _GMainContext GMainContext;",
+                "include": "glib.h",
+                "main": [
+                    "g_thread_init(NULL);",
+                    "(void) g_main_context_default();",
+                    "(void) g_source_new(0, 0);",
+                    "g_source_add_poll(NULL, NULL);"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "glib-2.0 gthread-2.0" }
             ]
@@ -44,7 +56,22 @@
         },
         "icu": {
             "label": "ICU",
-            "test": "unix/icu",
+            "test": {
+                "include": [ "unicode/utypes.h", "unicode/ucol.h", "unicode/ustring.h" ],
+                "main": [
+                    "UErrorCode status = U_ZERO_ERROR;",
+                    "UCollator *collator = ucol_open(\"ru_RU\", &status);",
+                    "if (!U_FAILURE(status))",
+                    "    ucol_close(collator);"
+                ],
+                "qmake": [
+                    "CONFIG += build_all",
+                    "CONFIG(debug, debug|release): \\",
+                    "    LIBS += $$LIBS_DEBUG",
+                    "else: \\",
+                    "    LIBS += $$LIBS_RELEASE"
+                ]
+            },
             "sources": [
                 {
                     "builds": {
@@ -62,7 +89,10 @@
         },
         "journald": {
             "label": "journald",
-            "test": "unix/journald",
+            "test": {
+                "include": [ "systemd/sd-journal.h", "syslog.h" ],
+                "main": "sd_journal_send(\"PRIORITY=%i\", LOG_INFO, NULL);"
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "libsystemd" },
                 { "type": "pkgConfig", "args": "libsystemd-journal" }
@@ -70,7 +100,26 @@
         },
         "libatomic": {
             "label": "64 bit atomics",
-            "test": "common/atomic64",
+            "test": {
+                "include": [ "atomic", "cstdint" ],
+                "tail": [
+                    "void test(volatile std::atomic<std::int64_t> &a)",
+                    "{",
+                    "    std::int64_t v = a.load(std::memory_order_acquire);",
+                    "    while (!a.compare_exchange_strong(v, v + 1,",
+                    "                                      std::memory_order_acq_rel,",
+                    "                                      std::memory_order_acquire)) {",
+                    "        v = a.exchange(v - 1);",
+                    "    }",
+                    "    a.store(v + 1, std::memory_order_release);",
+                    "}"
+                ],
+                "main": [
+                    "void *ptr = (void*)0xffffffc0; // any random pointer",
+                    "test(*reinterpret_cast<std::atomic<std::int64_t> *>(ptr));"
+                ],
+                "qmake": "CONFIG += c++11"
+            },
             "sources": [
                 "",
                 "-latomic"
@@ -78,7 +127,10 @@
         },
         "libdl": {
             "label": "dlopen()",
-            "test": "unix/dlopen",
+            "test": {
+                "include": "dlfcn.h",
+                "main": "dlopen(0, 0);"
+            },
             "sources": [
                 "",
                 "-ldl"
@@ -86,7 +138,10 @@
         },
         "librt": {
             "label": "clock_gettime()",
-            "test": "unix/clock-gettime",
+            "test": {
+                "include": [ "unistd.h", "time.h" ],
+                "main": "timespec ts; clock_gettime(CLOCK_REALTIME, &ts);"
+            },
             "sources": [
                 "",
                 "-lrt"
@@ -94,21 +149,38 @@
         },
         "pcre2": {
             "label": "PCRE2",
-            "test": "unix/pcre2",
+            "test": {
+                "head": "#define PCRE2_CODE_UNIT_WIDTH 16",
+                "include": "pcre2.h",
+                "tail": [
+                    "#if (PCRE2_MAJOR < 10) || ((PCRE2_MAJOR == 10) && (PCRE2_MINOR < 20))",
+                    "#  error This PCRE version is not supported",
+                    "#endif"
+                ]
+            },
             "sources": [
                 "-lpcre2-16"
             ]
         },
         "pps": {
             "label": "PPS",
-            "test": "unix/pps",
+            "test": {
+                "include": "sys/pps.h",
+                "main": [
+                    "pps_decoder_t decoder;",
+                    "pps_decoder_initialize(&decoder, NULL);"
+                ]
+            },
             "sources": [
                 "-lpps"
             ]
         },
         "slog2": {
             "label": "slog2",
-            "test": "unix/slog2",
+            "test": {
+                "include": "slog2.h",
+                "main": "slog2_set_default_buffer((slog2_buffer_t)-1);"
+            },
             "export": "",
             "sources": [
                 "-lslog2"
@@ -120,23 +192,77 @@
         "atomicfptr": {
             "label": "working std::atomic for function pointers",
             "type": "compile",
-            "test": "common/atomicfptr"
+            "test": {
+                "include": "atomic",
+                "tail": [
+                    "typedef void (*fptr)(int);",
+                    "typedef std::atomic<fptr> atomicfptr;",
+                    "void testfunction(int) { }",
+                    "void test(volatile atomicfptr &a)",
+                    "{",
+                    "    fptr v = a.load(std::memory_order_acquire);",
+                    "    while (!a.compare_exchange_strong(v, &testfunction,",
+                    "                                      std::memory_order_acq_rel,",
+                    "                                      std::memory_order_acquire)) {",
+                    "        v = a.exchange(&testfunction);",
+                    "    }",
+                    "    a.store(&testfunction, std::memory_order_release);",
+                    "}"
+                ],
+                "main": [
+                    "atomicfptr fptr(testfunction);",
+                    "test(fptr);"
+                ],
+                "qmake": "CONFIG += c++11"
+            }
         },
         "clock-monotonic": {
             "label": "POSIX monotonic clock",
             "type": "compile",
-            "test": "unix/clock-monotonic",
+            "test": {
+                "include": [ "unistd.h", "time.h" ],
+                "main": [
+                    "#if defined(_POSIX_MONOTONIC_CLOCK) && (_POSIX_MONOTONIC_CLOCK-0 >= 0)",
+                    "timespec ts;",
+                    "clock_gettime(CLOCK_MONOTONIC, &ts);",
+                    "#else",
+                    "#  error Feature _POSIX_MONOTONIC_CLOCK not available",
+                    "#endif"
+                ]
+            },
             "use": "librt"
         },
         "cloexec": {
             "label": "O_CLOEXEC",
             "type": "compile",
-            "test": "unix/cloexec"
+            "test": {
+                "head": "#define _GNU_SOURCE 1",
+                "include": [ "sys/types.h", "sys/socket.h", "fcntl.h", "unistd.h" ],
+                "main": [
+                    "int pipes[2];",
+                    "(void) pipe2(pipes, O_CLOEXEC | O_NONBLOCK);",
+                    "(void) fcntl(0, F_DUPFD_CLOEXEC, 0);",
+                    "(void) dup3(0, 3, O_CLOEXEC);",
+                    "#if defined(__NetBSD__)",
+                    "(void) paccept(0, 0, 0, NULL, SOCK_CLOEXEC | SOCK_NONBLOCK);",
+                    "#else",
+                    "(void) accept4(0, 0, 0, SOCK_CLOEXEC | SOCK_NONBLOCK);",
+                    "#endif"
+                ]
+            }
         },
         "eventfd": {
             "label": "eventfd",
             "type": "compile",
-            "test": "unix/eventfd"
+            "test": {
+                "include": "sys/eventfd.h",
+                "main": [
+                    "eventfd_t value;",
+                    "int fd = eventfd(0, EFD_CLOEXEC);",
+                    "eventfd_read(fd, &value);",
+                    "eventfd_write(fd, value);"
+                ]
+            }
         },
         "posix-iconv": {
             "label": "POSIX iconv",
@@ -151,37 +277,89 @@
         "inotify": {
             "label": "inotify",
             "type": "compile",
-            "test": "unix/inotify"
+            "test": {
+                "include": "sys/inotify.h",
+                "main": [
+                    "inotify_init();",
+                    "inotify_add_watch(0, \"foobar\", IN_ACCESS);",
+                    "inotify_rm_watch(0, 1);"
+                ]
+            }
         },
         "ipc_sysv": {
             "label": "SysV IPC",
             "type": "compile",
-            "test": "unix/ipc_sysv"
+            "test": {
+                "include": [ "sys/types.h", "sys/ipc.h", "sys/sem.h", "sys/shm.h", "fcntl.h" ],
+                "main": [
+                    "key_t unix_key = ftok(\"test\", 'Q');",
+                    "semctl(semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL), 0, IPC_RMID, 0);",
+                    "shmget(unix_key, 0, 0666 | IPC_CREAT | IPC_EXCL);",
+                    "shmctl(0, 0, (struct shmid_ds *)(0));"
+                ]
+            }
         },
         "ipc_posix": {
             "label": "POSIX IPC",
             "type": "compile",
-            "test": "unix/ipc_posix"
+            "test": {
+                "include": [ "sys/types.h", "sys/mman.h", "semaphore.h", "fcntl.h" ],
+                "main": [
+                    "sem_close(sem_open(\"test\", O_CREAT | O_EXCL, 0666, 0));",
+                    "shm_open(\"test\", O_RDWR | O_CREAT | O_EXCL, 0666);",
+                    "shm_unlink(\"test\");"
+                ],
+                "qmake": "linux: LIBS += -lpthread -lrt"
+            }
         },
         "ppoll": {
             "label": "ppoll()",
             "type": "compile",
-            "test": "unix/ppoll"
+            "test": {
+                "include": [ "signal.h", "poll.h" ],
+                "main": [
+                    "struct pollfd pfd;",
+                    "struct timespec ts;",
+                    "sigset_t sig;",
+                    "ppoll(&pfd, 1, &ts, &sig);"
+                ]
+            }
         },
         "pollts": {
             "label": "pollts()",
             "type": "compile",
-            "test": "unix/pollts"
+            "test": {
+                "include": [ "poll.h", "signal.h", "time.h" ],
+                "main": [
+                    "struct pollfd pfd;",
+                    "struct timespec ts;",
+                    "sigset_t sig;",
+                    "pollts(&pfd, 1, &ts, &sig);"
+                ]
+            }
         },
         "poll": {
             "label": "poll()",
             "type": "compile",
-            "test": "unix/poll"
+            "test": {
+                "include": "poll.h",
+                "main": [
+                    "struct pollfd pfd;",
+                    "poll(&pfd, 1, 0);"
+                ]
+            }
         },
         "syslog": {
             "label": "syslog",
             "type": "compile",
-            "test": "unix/syslog"
+            "test": {
+                "include": "syslog.h",
+                "main": [
+                    "openlog(\"qt\", 0, LOG_USER);",
+                    "syslog(LOG_INFO, \"configure\");",
+                    "closelog();"
+                ]
+            }
         },
         "xlocalescanprint": {
             "label": "xlocale.h (or equivalents)",
diff --git a/src/gui/configure.json b/src/gui/configure.json
index a51557e6cd..062171606e 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -66,14 +66,30 @@
         "direct2d": {
             "label": "Direct 2D",
             "export": "",
-            "test": "qpa/direct2d",
+            "test": {
+                "include": [ "d3d11_1.h", "d2d1_1.h", "d2d1_1helper.h", "dxgi1_2.h", "wrl.h", "dwrite.h" ],
+                "tail": "using Microsoft::WRL::ComPtr;",
+                "main": [
+                    "ComPtr<ID2D1Factory1> d2dFactory;",
+                    "D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, d2dFactory.ReleaseAndGetAddressOf());",
+                    "ComPtr<IDXGISurface1> surface;",
+                    "(void) surface;"
+                ]
+            },
             "sources": [
                 "-ld2d1 -ldwrite -ld3d11"
             ]
         },
         "directfb": {
             "label": "DirectFB",
-            "test": "qpa/directfb",
+            "test": {
+                "include": "directfb.h",
+                "tail": [
+                    "#ifdef __typeof__",
+                    "#  error DirectFB headers are unclean and cannot compile",
+                    "#endif"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "directfb" }
             ]
@@ -81,14 +97,30 @@
         "directwrite": {
             "label": "DirectWrite",
             "export": "",
-            "test": "win/directwrite",
+            "test": {
+                "include": [ "dwrite.h", "d2d1.h" ],
+                "main": [
+                    "IDWriteFactory *factory = 0;",
+                    "DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory),",
+                    "                    (IUnknown **)(&factory));"
+                ]
+            },
             "sources": [
                 "-ldwrite"
             ]
         },
         "drm": {
             "label": "KMS",
-            "test": "qpa/kms",
+            "test": {
+                "include": [ "stdlib.h", "stdint.h" ],
+                "tail": [
+                    "extern \"C\" {",
+                    "#include <xf86drmMode.h>",
+                    "#include <xf86drm.h>",
+                    "}"
+                ],
+                "main": "(void) drmModeGetCrtc(0, 0);"
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "libdrm" },
                 { "libs": "-ldrm", "condition": "!config.integrity" },
@@ -97,7 +129,13 @@
         },
         "egl": {
             "label": "EGL",
-            "test": "qpa/egl",
+            "test": {
+                "include": "EGL/egl.h",
+                "main": [
+                    "EGLint x = 0; EGLDisplay dpy = 0; EGLContext ctx = 0;",
+                    "eglDestroyContext(dpy, ctx);"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "egl" },
                 { "type": "makeSpec", "spec": "EGL" }
@@ -105,7 +143,18 @@
         },
         "freetype": {
             "label": "FreeType",
-            "test": "unix/freetype",
+            "test": {
+                "head": [
+                    "#include <ft2build.h>",
+                    "#include FT_FREETYPE_H",
+                    "#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20200)",
+                    "#  error This version of freetype is too old.",
+                    "#endif"
+                ],
+                "main": [
+                    "FT_Face face = 0;"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "freetype2" },
                 { "type": "freetype", "libs": "-lfreetype" }
@@ -113,7 +162,23 @@
         },
         "fontconfig": {
             "label": "Fontconfig",
-            "test": "unix/fontconfig",
+            "test": {
+                "head": [
+                    "#include <ft2build.h>",
+                    "#include FT_FREETYPE_H",
+                    "#include <fontconfig/fontconfig.h>",
+                    "#ifndef FC_RGBA_UNKNOWN",
+                    "#  error This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define",
+                    "#endif",
+                    "#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20110)",
+                    "#  error This version of freetype is too old.",
+                    "#endif"
+                ],
+                "main": [
+                    "FT_Face face = 0;",
+                    "FcPattern *pattern = 0;"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "fontconfig freetype2" },
                 { "type": "freetype", "libs": "-lfontconfig -lfreetype" }
@@ -121,14 +186,37 @@
         },
         "gbm": {
             "label": "GBM",
-            "test": "qpa/gbm",
+            "test": {
+                "include": [ "stdlib.h", "stdint.h" ],
+                "tail": [
+                    "extern \"C\" {",
+                    "#include <gbm.h>",
+                    "}"
+                ],
+                "main": "gbm_surface *surface = 0;"
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "gbm" }
             ]
         },
         "harfbuzz": {
             "label": "HarfBuzz",
-            "test": "unix/harfbuzz",
+            "test": {
+                "include": "harfbuzz/hb.h",
+                "tail": [
+                    "#if !HB_VERSION_ATLEAST(0, 9, 42)",
+                    "#  error This version of harfbuzz is too old.",
+                    "#endif"
+                ],
+                "main": [
+                    "hb_buffer_t *buffer = hb_buffer_create();",
+                    "const uint16_t string[] = { 'A', 'b', 'c' };",
+                    "hb_buffer_add_utf16(buffer, string, 3, 0, 3);",
+                    "hb_buffer_guess_segment_properties(buffer);",
+                    "hb_buffer_set_flags(buffer, hb_buffer_flags_t(HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES));",
+                    "hb_buffer_destroy(buffer);"
+                ]
+            },
             "sources": [
                 "-lharfbuzz"
             ]
@@ -136,35 +224,62 @@
         "imf": {
             "label": "IMF",
             "export": "",
-            "test": "unix/qqnx_imf",
+            "test": {
+                "include": "imf/imf_client.h",
+                "main": "imf_client_init();"
+            },
             "sources": [
                 "-linput_client"
             ]
         },
         "lgmon": {
             "label": "lgmon",
-            "test": "unix/lgmon",
+            "test": {
+                "include": "lgmon.h",
+                "main": "lgmon_supported(getpid());"
+            },
             "sources": [
                 "-llgmon"
             ]
         },
         "libinput": {
             "label": "libinput",
-            "test": "unix/libinput",
+            "test": {
+                "include": "libinput.h",
+                "main": "libinput_udev_create_context(NULL, NULL, NULL);"
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "libinput" }
             ]
         },
         "integrityhid": {
             "label": "integrityhid",
-            "test": "qpa/integrityhid",
+            "test": {
+                "include": [ "stdlib.h", "stdint.h", "device/hiddriver.h" ],
+                "main": [
+                    "HIDDriver *driver;",
+                    "uintptr_t devicecontext;",
+                    "uint32_t device_id;",
+                    "gh_hid_enum_devices(driver, &device_id, &devicecontext);"
+                ]
+            },
             "sources": [
                 { "libs": "-lhiddev -lusbhid -lusb" }
             ]
         },
         "libjpeg": {
             "label": "libjpeg",
-            "test": "unix/libjpeg",
+            "test": {
+                "include": [ "sys/types.h", "stdio.h" ],
+                "tail": [
+                    "extern \"C\" {",
+                    "#include <jpeglib.h>",
+                    "}",
+                    "",
+                    "j_compress_ptr cinfo;"
+                ],
+                "main": "jpeg_create_compress(cinfo);"
+            },
             "sources": [
                 { "libs": "-llibjpeg", "condition": "config.msvc" },
                 { "libs": "-ljpeg", "condition": "!config.msvc" }
@@ -172,7 +287,10 @@
         },
         "libpng": {
             "label": "libpng",
-            "test": "unix/libpng",
+            "test": {
+                "include": "png.h",
+                "main": "(void) png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0);"
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "libpng" },
                 { "libs": "-llibpng", "condition": "config.msvc" },
@@ -184,21 +302,50 @@
         },
         "mirclient": {
             "label": "Mir client libraries",
-            "test": "qpa/mirclient",
+            "test": {
+                "include": [ "mir_toolkit/mir_client_library.h", "ubuntu/application/lifecycle_delegate.h", "EGL/egl.h" ],
+                "tail": "static void surfaceCreateCallback(MirSurface*, void*) {}",
+                "main": [
+                    "u_application_lifecycle_delegate_new();",
+                    "mir_surface_create(0, surfaceCreateCallback, 0);"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "egl mirclient ubuntu-platform-api libcontent-hub >= 0.2.0" }
             ]
         },
         "mtdev": {
             "label": "mtdev",
-            "test": "unix/mtdev",
+            "test": {
+                "include": "mtdev.h",
+                "main": [
+                    "mtdev m;",
+                    "mtdev_open(&m, 0);"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "mtdev" }
             ]
         },
         "opengl": {
             "label": "Desktop OpenGL",
-            "test": "unix/opengldesktop",
+            "test": {
+                "head": [
+                    "#ifdef __APPLE__",
+                    "#  include <OpenGL/gl.h>",
+                    "#else",
+                    "#  define GL_GLEXT_PROTOTYPES",
+                    "#  include <GL/gl.h>",
+                    "#endif"
+                ],
+                "main": [
+                    "glBegin(GL_TRIANGLES);",
+                    "    glVertex2f(20.0f, 10.0f);",
+                    "    glVertex2f(10.0f, 30.0f);",
+                    "    glVertex2f(20.0f, 50.0f);",
+                    "glEnd();"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "gl", "condition": "!config.darwin" },
                 { "type": "makeSpec", "spec": "OPENGL" }
@@ -206,7 +353,20 @@
         },
         "opengl_es2": {
             "label": "OpenGL ES 2.0",
-            "test": "unix/opengles2",
+            "test": {
+                "head": [
+                    "#ifdef __APPLE__",
+                    "#  include <OpenGLES/ES2/gl.h>",
+                    "#else",
+                    "#  define GL_GLEXT_PROTOTYPES",
+                    "#  include <GLES2/gl2.h>",
+                    "#endif"
+                ],
+                "main": [
+                    "glUniform1f(1, GLfloat(1.0));",
+                    "glClear(GL_COLOR_BUFFER_BIT);"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "glesv2", "condition": "!config.darwin" },
                 { "type": "makeSpec", "spec": "OPENGL_ES2" }
@@ -214,7 +374,10 @@
         },
         "openvg": {
             "label": "OpenVG",
-            "test": "unix/openvg",
+            "test": {
+                "include": "VG/openvg.h",
+                "main": "VGint i = 2; vgFlush();"
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "vg" },
                 { "type": "makeSpec", "spec": "OPENVG" }
@@ -222,14 +385,20 @@
         },
         "tslib": {
             "label": "tslib",
-            "test": "unix/tslib",
+            "test": {
+                "include": "tslib.h",
+                "main": "ts_open(\"foo\", 0);"
+            },
             "sources": [
                 "-lts"
             ]
         },
         "wayland_server": {
             "label": "Wayland Server",
-            "test": "qpa/wayland-server",
+            "test": {
+                "include": "wayland-server.h",
+                "main": "wl_display_create();"
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "wayland-server" }
             ]
@@ -242,7 +411,15 @@
         },
         "xcb": {
             "label": "XCB >= 1.5 (core)",
-            "test": "qpa/xcb",
+            "test": {
+                "include": "xcb/xcb.h",
+                "main": [
+                    "int primaryScreen = 0;",
+                    "(void)xcb_connect(\"\", &primaryScreen);",
+                    "// This won't compile unless libxcb >= 1.5 which defines XCB_ATOM_PRIMARY.",
+                    "int xcbAtomPrimary = XCB_ATOM_PRIMARY;"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "xcb >= 1.5" },
                 "-lxcb"
@@ -250,7 +427,27 @@
         },
         "xcb_syslibs": {
             "label": "XCB (extensions)",
-            "test": "qpa/xcb-syslibs",
+            "test": {
+                "include": [
+                    "xcb/xcb.h",
+                    "xcb/xfixes.h",
+                    "xcb/xcb_image.h",
+                    "xcb/xcb_keysyms.h",
+                    "xcb/sync.h",
+                    "xcb/randr.h",
+                    "xcb/shm.h"
+                ],
+                "tail": [
+                    "// This workaround can be removed for xcb-icccm > 3.8",
+                    "#define class class_name",
+                    "#include <xcb/xcb_icccm.h>",
+                    "#undef class"
+                ],
+                "main": [
+                    "int primaryScreen = 0;",
+                    "(void) xcb_connect(\"\", &primaryScreen);"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig",
                   "args": "xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm xcb-shape" },
@@ -259,7 +456,13 @@
         },
         "xcb_xlib": {
             "label": "XCB Xlib",
-            "test": "qpa/xcb-xlib",
+            "test": {
+                "include": [ "xcb/xcb.h", "X11/Xlib.h", "X11/Xlib-xcb.h" ],
+                "main": [
+                    "Display *dpy = XOpenDisplay(\"\");",
+                    "(void) XGetXCBConnection(dpy);"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "x11-xcb x11 xcb" },
                 "-lxcb -lX11 -lX11-xcb"
@@ -267,7 +470,18 @@
         },
         "xcb_xkb": {
             "label": "XCB XKB >= 1.10",
-            "test": "qpa/xcb-xkb",
+            "test": {
+                "head": [
+                    "// xkb.h is using a variable called 'explicit', which is a reserved keyword in C++",
+                    "#define explicit dont_use_cxx_explicit"
+                ],
+                "include": "xcb/xkb.h",
+                "tail": "#undef explicit",
+                "main": [
+                    "// This takes more arguments in xcb-xkb < 1.10.",
+                    "xcb_xkb_get_kbd_by_name_unchecked(NULL, 0, 0, 0, 0);"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "xcb-xkb >= 1.10 xcb" },
                 "-lxcb-xkb -lxcb"
@@ -275,7 +489,30 @@
         },
         "xcb_render": {
             "label": "XCB XRender",
-            "test": "qpa/xcb-render",
+            "test": {
+                "include": [ "xcb/xcb.h", "xcb/render.h" ],
+                "tail": [
+                    "// 'template' is used as a function argument name in xcb_renderutil.h",
+                    "#define template template_param",
+                    "// extern \"C\" is missing, too",
+                    "extern \"C\" {",
+                    "#include <xcb/xcb_renderutil.h>",
+                    "}",
+                    "#undef template"
+                ],
+                "main": [
+                    "int primaryScreen = 0;",
+                    "xcb_generic_error_t *error = 0;",
+                    "xcb_connection_t *connection = xcb_connect(\"\", &primaryScreen);",
+                    "xcb_render_query_pict_formats_cookie_t formatsCookie =",
+                    "    xcb_render_query_pict_formats(connection);",
+                    "xcb_render_query_pict_formats_reply_t *formatsReply =",
+                    "    xcb_render_query_pict_formats_reply(",
+                    "            connection, formatsCookie, &error);",
+                    "xcb_render_util_find_standard_format(",
+                    "        formatsReply, XCB_PICT_STANDARD_ARGB_32);"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "xcb-renderutil xcb-render xcb" },
                 "-lxcb-render-util -lxcb-render -lxcb"
@@ -283,7 +520,17 @@
         },
         "xcb_glx": {
             "label": "XCB GLX",
-            "test": "qpa/xcb-glx",
+            "test": {
+                "include": [ "xcb/xcb.h", "xcb/glx.h" ],
+                "main": [
+                    "int primaryScreen = 0;",
+                    "xcb_connection_t *connection = xcb_connect(\"\", &primaryScreen);",
+                    "xcb_generic_error_t *error = 0;",
+                    "xcb_glx_query_version_cookie_t xglx_query_cookie = xcb_glx_query_version(",
+                    "        connection, XCB_GLX_MAJOR_VERSION, XCB_GLX_MINOR_VERSION);",
+                    "xcb_glx_query_version_reply(connection, xglx_query_cookie, &error);"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "xcb-glx xcb" },
                 "-lxcb-glx -lxcb"
@@ -291,7 +538,28 @@
         },
         "xinput2": {
             "label": "Xinput2",
-            "test": "x11/xinput2",
+            "test": {
+                "include": [ "X11/Xlib.h", "X11/extensions/XInput2.h", "X11/extensions/Xge.h" ],
+                "tail": [
+                    "#ifndef XInput_2_0",
+                    "#  error Missing XInput_2_0 #define",
+                    "#endif"
+                ],
+                "main": [
+                    "// need XGenericEventCookie for XInput2 to work",
+                    "Display *dpy = 0;",
+                    "XEvent xevent;",
+                    "XIEvent *xievent = 0;",
+                    "XIDeviceEvent *xideviceevent = 0;",
+                    "XIHierarchyEvent *xihierarchyevent = 0;",
+                    "int deviceid = 0;",
+                    "int len = 0;",
+                    "(void) XGetEventData(dpy, &xevent.xcookie);",
+                    "XFreeEventData(dpy, &xevent.xcookie);",
+                    "(void) XIListProperties(dpy, deviceid, &len);"
+                ],
+                "qmake": "CONFIG += x11"
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "xi" },
                 "-lXi"
@@ -300,7 +568,10 @@
         "xkbcommon": {
             "label": "xkbcommon",
             "export": "xkbcommon_evdev",
-            "test": "unix/xkbcommon",
+            "test": {
+                "include": [ "xkbcommon/xkbcommon.h", "xkbcommon/xkbcommon-keysyms.h", "xkbcommon/xkbcommon-names.h" ],
+                "main": "xkb_context_new(XKB_CONTEXT_NO_FLAGS);"
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "xkbcommon" }
             ]
@@ -323,7 +594,15 @@
         "directwrite2": {
             "label": "DirectWrite 2",
             "type": "compile",
-            "test": "win/directwrite2",
+            "test": {
+                "include": [ "dwrite_2.h", "d2d1.h" ],
+                "main": [
+                    "IUnknown *factory = 0;",
+                    "(void)(size_t(DWRITE_E_NOCOLOR) + sizeof(IDWriteFontFace2));",
+                    "DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory2),",
+                    "                    &factory);"
+                ]
+            },
             "use": "directwrite"
         },
         "directx": {
@@ -338,70 +617,180 @@
         "egl-x11": {
             "label": "EGL on X11",
             "type": "compile",
-            "test": "qpa/egl-x11",
+            "test": {
+                "head": [
+                    "// Check if EGL is compatible with X. Some EGL implementations, typically on",
+                    "// embedded devices, are not intended to be used together with X. EGL support",
+                    "// has to be disabled in plugins like xcb in this case since the native display,",
+                    "// window and pixmap types will be different than what an X-based platform",
+                    "// plugin would expect."
+                ],
+                "include": [ "EGL/egl.h", "xcb/xcb.h", "X11/Xlib.h", "X11/Xlib-xcb.h" ],
+                "main": [
+                    "Display *dpy = EGL_DEFAULT_DISPLAY;",
+                    "EGLNativeDisplayType egldpy = XOpenDisplay(\"\");",
+                    "dpy = egldpy;",
+                    "EGLNativeWindowType w = XCreateWindow(dpy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);",
+                    "XDestroyWindow(dpy, w);",
+                    "XCloseDisplay(dpy);"
+                ]
+            },
             "use": "egl xcb_xlib"
         },
         "egl-brcm": {
             "label": "Broadcom EGL (Raspberry Pi)",
             "type": "compile",
-            "test": "qpa/eglfs-brcm",
+            "test": {
+                "include": [ "EGL/egl.h", "bcm_host.h" ],
+                "main": "vc_dispmanx_display_open(0);"
+            },
             "use": "egl bcm_host"
         },
         "egl-egldevice": {
             "label": "EGLDevice",
             "type": "compile",
-            "test": "qpa/eglfs-egldevice",
+            "test": {
+                "include": [ "EGL/egl.h", "EGL/eglext.h" ],
+                "main": [
+                    "EGLDeviceEXT device = 0;",
+                    "EGLStreamKHR stream = 0;",
+                    "EGLOutputLayerEXT layer = 0;",
+                    "(void) EGL_DRM_CRTC_EXT;"
+                ]
+            },
             "use": "egl"
         },
         "egl-mali": {
             "label": "Mali EGL",
             "type": "compile",
-            "test": "qpa/eglfs-mali",
+            "test": {
+                "include": [ "EGL/fbdev_window.h", "EGL/egl.h", "GLES2/gl2.h" ],
+                "main": "fbdev_window *w = 0;"
+            },
             "use": "egl"
         },
         "egl-mali-2": {
             "label": "Mali 2 EGL",
             "type": "compile",
-            "test": "qpa/eglfs-mali-2",
+            "test": {
+                "include": [ "EGL/egl.h", "GLES2/gl2.h" ],
+                "main": "mali_native_window *w = 0;"
+            },
             "use": "egl"
         },
         "egl-viv": {
             "label": "i.Mx6 EGL",
             "type": "compile",
-            "test": "qpa/eglfs-viv",
+            "test": {
+                "include": [ "EGL/egl.h", "EGL/eglvivante.h" ],
+                "main": [
+                    "#ifdef __INTEGRITY",
+                    "fbGetDisplay();",
+                    "#else",
+                    "// Do not rely on fbGetDisplay(), since the signature has changed over time.",
+                    "// Stick to fbGetDisplayByIndex().",
+                    "fbGetDisplayByIndex(0);",
+                    "#endif"
+                ],
+                "qmake": [
+                    "DEFINES += EGL_API_FB=1",
+                    "!integrity: DEFINES += LINUX=1"
+                ]
+            },
             "use": "egl"
         },
         "evdev": {
             "label": "evdev",
             "type": "compile",
-            "test": "unix/evdev"
+            "test": {
+                "head": [
+                    "#if defined(__FreeBSD__)",
+                    "#  include <dev/evdev/input.h>",
+                    "#else",
+                    "#  include <linux/input.h>",
+                    "#  include <linux/kd.h>",
+                    "#endif",
+                    "enum {",
+                    "    e1 = ABS_PRESSURE,",
+                    "    e2 = ABS_X,",
+                    "    e3 = REL_X,",
+                    "    e4 = SYN_REPORT,",
+                    "};"
+                ],
+                "main": [
+                    "input_event buf[32];",
+                    "(void) buf;"
+                ]
+            }
         },
         "integrityfb": {
             "label": "INTEGRITY framebuffer",
             "type": "compile",
-            "test": "qpa/integrityfb"
+            "test": {
+                "include": "device/fbdriver.h",
+                "main": "FBDriver *driver = 0;"
+            }
         },
         "libinput_axis_api": {
             "label": "axis API in libinput",
             "type": "compile",
-            "test": "unix/libinput_axis_api",
+            "test": {
+                "include": "libinput.h",
+                "main": "libinput_event_pointer_has_axis(nullptr, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);"
+            },
             "use": "libinput"
         },
         "linuxfb": {
             "label": "LinuxFB",
             "type": "compile",
-            "test": "qpa/linuxfb"
+            "test": {
+                "include": [ "linux/fb.h", "sys/kd.h", "sys/ioctl.h" ],
+                "main": [
+                    "fb_fix_screeninfo finfo;",
+                    "fb_var_screeninfo vinfo;",
+                    "int fd = 3;",
+                    "ioctl(fd, FBIOGET_FSCREENINFO, &finfo);",
+                    "ioctl(fd, FBIOGET_VSCREENINFO, &vinfo);"
+                ]
+            }
         },
         "opengles3": {
             "label": "OpenGL ES 3.0",
             "type": "compile",
-            "test": "unix/opengles3",
+            "test": {
+                "head": [
+                    "#ifdef __APPLE__",
+                    "#  include <OpenGLES/ES3/gl.h>",
+                    "#else",
+                    "#  define GL_GLEXT_PROTOTYPES",
+                    "#  include <GLES3/gl3.h>",
+                    "#endif"
+                ],
+                "main": [
+                    "static GLfloat f[6];",
+                    "glGetStringi(GL_EXTENSIONS, 0);",
+                    "glReadBuffer(GL_COLOR_ATTACHMENT1);",
+                    "glUniformMatrix2x3fv(0, 0, GL_FALSE, f);",
+                    "glMapBufferRange(GL_ARRAY_BUFFER, 0, 0, GL_MAP_READ_BIT);"
+                ]
+            },
+            "comment": [
+                "The library is expected to be the same as in ES 2.0 (libGLESv2).",
+                "The difference is the header and the presence of the functions in",
+                "the library."
+            ],
             "use": "opengl_es2"
         },
         "opengles31": {
             "label": "OpenGL ES 3.1",
             "type": "compile",
-            "test": "unix/opengles31",
+            "test": {
+                "include": "GLES3/gl31.h",
+                "main": [
+                    "glDispatchCompute(1, 1, 1);",
+                    "glProgramUniform1i(0, 0, 0);"
+                ]
+            },
             "use": "opengl_es2"
         },
         "qpa_default_platform": {
@@ -427,7 +816,14 @@
         "xlib": {
             "label": "XLib",
             "type": "compile",
-            "test": "x11/xlib"
+            "test": {
+                "include": "X11/Xlib.h",
+                "main": [
+                    "Display *d = XOpenDisplay(NULL);",
+                    "XCloseDisplay(d);"
+                ],
+                "qmake": "CONFIG += x11"
+            }
         }
      },
 
diff --git a/src/network/configure.json b/src/network/configure.json
index d35dda99bc..c77004d4ba 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -38,7 +38,14 @@
         },
         "libproxy": {
             "label": "libproxy",
-            "test": "common/libproxy",
+            "test": {
+                "include": [ "proxy.h" ],
+                "main": [
+                    "pxProxyFactory *factory = px_proxy_factory_new();",
+                    "px_proxy_factory_get_proxies(factory, \"http://qt-project.org\");",
+                    "px_proxy_factory_free(factory);"
+                ]
+            },
             "sources": [
                 "-lproxy"
             ]
@@ -85,25 +92,66 @@
         "getaddrinfo": {
             "label": "getaddrinfo()",
             "type": "compile",
-            "test": "unix/getaddrinfo",
+            "test": {
+                "head": [
+                    "#include <stdio.h>",
+                    "#include <stdlib.h>",
+                    "#ifdef __MINGW32__",
+                    "#  include <winsock2.h>",
+                    "#  include <ws2tcpip.h>",
+                    "#else",
+                    "#  include <sys/types.h>",
+                    "#  include <sys/socket.h>",
+                    "#  include <netdb.h>",
+                    "#endif"
+                ],
+                "main": [
+                    "addrinfo *res = 0;",
+                    "(void) getaddrinfo(\"foo\", 0, 0, &res);",
+                    "freeaddrinfo(res);",
+                    "gai_strerror(0);"
+                ]
+            },
             "use": "network"
         },
         "getifaddrs": {
             "label": "getifaddrs()",
             "type": "compile",
-            "test": "unix/getifaddrs",
+            "test": {
+                "include": [ "sys/types.h", "sys/socket.h", "net/if.h", "ifaddrs.h" ],
+                "main": [
+                    "ifaddrs *list;",
+                    "getifaddrs(&list);",
+                    "freeifaddrs(list);"
+                ]
+            },
             "use": "network"
         },
         "ipv6ifname": {
             "label": "IPv6 ifname",
             "type": "compile",
-            "test": "unix/ipv6ifname",
+            "test": {
+                "include": [ "sys/types.h", "sys/socket.h", "net/if.h" ],
+                "main": [
+                    "char buf[IFNAMSIZ];",
+                    "if_nametoindex(\"eth0\");",
+                    "if_indextoname(1, buf);"
+                ]
+            },
             "use": "network"
         },
         "sctp": {
             "label": "SCTP support",
             "type": "compile",
-            "test": "unix/sctp",
+            "test": {
+                "include": [ "sys/types.h", "sys/socket.h", "netinet/in.h", "netinet/sctp.h" ],
+                "main": [
+                    "sctp_initmsg sctpInitMsg;",
+                    "socklen_t sctpInitMsgSize = sizeof(sctpInitMsg);",
+                    "(void) socket(PF_INET, SOCK_STREAM, IPPROTO_SCTP);",
+                    "(void) getsockopt(-1, SOL_SCTP, SCTP_INITMSG, &sctpInitMsg, &sctpInitMsgSize);"
+                ]
+            },
             "use": "network"
         }
     },
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
index 5603ceb37b..234f880579 100644
--- a/src/plugins/sqldrivers/configure.json
+++ b/src/plugins/sqldrivers/configure.json
@@ -39,7 +39,9 @@
     "libraries": {
         "db2": {
             "label": "DB2 (IBM)",
-            "test": "unix/db2",
+            "test": {
+                "include": [ "sqlcli.h", "sqlcli1.h" ]
+            },
             "sources": [
                 { "libs": "-ldb2cli", "condition": "config.win32" },
                 { "libs": "-ldb2", "condition": "!config.win32" }
@@ -47,7 +49,9 @@
         },
         "ibase": {
             "label": "InterBase",
-            "test": "unix/ibase",
+            "test": {
+                "include": "ibase.h"
+            },
             "sources": [
                 { "libs": "-lgds32_ms", "condition": "config.win32" },
                 { "libs": "-lgds", "condition": "!config.win32" }
@@ -55,7 +59,15 @@
         },
         "mysql": {
             "label": "MySQL",
-            "test": "unix/mysql",
+            "test": {
+                "head": [
+                    "#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(WIN64) || defined(_WIN64) || defined(__WIN64__)",
+                    "#  include <windows.h>",
+                    "#endif"
+                ],
+                "include": "mysql.h",
+                "main": "mysql_get_client_version();"
+            },
             "sources": [
                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true },
                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
@@ -68,7 +80,13 @@
         },
         "psql": {
             "label": "PostgreSQL",
-            "test": "unix/psql",
+            "test": {
+                "include": "libpq-fe.h",
+                "main": [
+                    "PQescapeBytea(0, 0, 0);",
+                    "PQunescapeBytea(0, 0);"
+                ]
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "libpq" },
                 { "type": "psqlConfig" },
@@ -78,7 +96,9 @@
         },
         "tds": {
             "label": "TDS (Sybase)",
-            "test": "unix/tds",
+            "test": {
+                "include": [ "sybfront.h", "sybdb.h" ]
+            },
             "sources": [
                 { "type": "sybaseEnv", "libs": "-lNTWDBLIB", "condition": "config.win32" },
                 { "type": "sybaseEnv", "libs": "-lsybdb", "condition": "!config.win32" }
@@ -86,7 +106,9 @@
         },
         "oci": {
             "label": "OCI (Oracle)",
-            "test": "unix/oci",
+            "test": {
+                "include": "oci.h"
+            },
             "sources": [
                 { "libs": "-loci", "condition": "config.win32" },
                 { "libs": "-lclntsh", "condition": "!config.win32" }
@@ -94,7 +116,18 @@
         },
         "odbc": {
             "label": "ODBC",
-            "test": "unix/odbc",
+            "test": {
+                "head": [
+                    "#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(WIN64) || defined(_WIN64) || defined(__WIN64__)",
+                    "#  include <windows.h>",
+                    "#endif"
+                ],
+                "include": [ "sql.h", "sqlext.h" ],
+                "main": [
+                    "SQLHANDLE env;",
+                    "SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &env);"
+                ]
+            },
             "sources": [
                 { "libs": "-lodbc32", "condition": "config.win32" },
                 { "libs": "-liodbc", "condition": "config.darwin" },
@@ -103,7 +136,9 @@
         },
         "sqlite2": {
             "label": "SQLite (version 2)",
-            "test": "unix/sqlite2",
+            "test": {
+                "include": "sqlite.h"
+            },
             "sources": [
                 "-lsqlite"
             ]
@@ -111,7 +146,10 @@
         "sqlite3": {
             "label": "SQLite (version 3)",
             "export": "sqlite",
-            "test": "unix/sqlite",
+            "test": {
+                "include": "sqlite3.h",
+                "main": "sqlite3_open_v2(0, 0, 0, 0);"
+            },
             "sources": [
                 { "type": "pkgConfig", "args": "sqlite3" },
                 "-lsqlite3"
diff --git a/src/printsupport/configure.json b/src/printsupport/configure.json
index ad38281145..e8cec22c09 100644
--- a/src/printsupport/configure.json
+++ b/src/printsupport/configure.json
@@ -16,7 +16,10 @@
     "libraries": {
         "cups": {
             "label": "CUPS",
-            "test": "unix/cups",
+            "test": {
+                "include": "cups/cups.h",
+                "main": "cupsGetNamedDest(CUPS_HTTP_DEFAULT, NULL, NULL);  // CUPS 1.4 test"
+            },
             "sources": [
                 "-lcups"
             ]