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

Conflicts:
	src/plugins/platforms/xcb/qxcbconnection.h
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
	src/plugins/styles/mac/qmacstyle_mac.mm
	src/widgets/widgets/qdockarealayout.cpp
	src/widgets/widgets/qmainwindow.cpp
	src/widgets/widgets/qmainwindowlayout.cpp
	src/widgets/widgets/qmainwindowlayout_p.h
	tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
	tests/auto/other/macnativeevents/BLACKLIST
	tests/auto/widgets/widgets/qmenu/BLACKLIST

Change-Id: Ic8e724b80a65e7b1af25511b0e674d209265e567

37 files changed, 0 insertions, 1068 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/atomicfptr/icc2016_mac.diff b/config.tests/common/atomicfptr/icc2016_mac.diff
deleted file mode 100644
index 5de3b6e19a..0000000000
--- a/config.tests/common/atomicfptr/icc2016_mac.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch for fixing std::atomic support for function pointers for the Intel
-Composer XE 2016 (compiler version 16.0).
-
-To apply:
-  cd /opt/intel/compilers_and_libraries_2016/mac/include
-  sudo patch -p1 < /path-to-this-file/icc2016_mac.diff
-
---- include/stdatomic.h.orig 2015-08-28 15:05:13.000000000 -0700
-+++ include/stdatomic.h      2015-08-28 15:19:25.000000000 -0700
-@@ -451,7 +451,7 @@
-     }
-     _STRONG_INLINE atomic() _DEFAULTED
-     _STRONG_INLINE _CONSTEXPR atomic(T* _Ptr)
--    : atomic_address(_Ptr)
-+    : atomic_address((void*)_Ptr)
-     {
-     }
-     _STRONG_INLINE T* operator+=(ptrdiff_t _V) volatile
diff --git a/config.tests/common/atomicfptr/qnx66.txt b/config.tests/common/atomicfptr/qnx66.txt
deleted file mode 100644
index b4ea9d65b5..0000000000
--- a/config.tests/common/atomicfptr/qnx66.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Patch is available from QNX. Please see
-
-http://www.qnx.com/download/feature.html?programid=27555
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 bf84089883..0000000000
--- a/config.tests/common/avx/avx.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES = avx.cpp
-CONFIG -= qt dylib release debug_and_release
-CONFIG += debug console
-!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 7ccf66ca28..0000000000
--- a/config.tests/common/avx2/avx2.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES = avx2.cpp
-CONFIG -= qt dylib release debug_and_release
-CONFIG += debug console
-!defined(QMAKE_CFLAGS_AVX2, "var"):error("This compiler does not support AVX2")
-else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX2
diff --git a/config.tests/common/avx512/avx512.cpp b/config.tests/common/avx512/avx512.cpp
deleted file mode 100644
index ca1a5d1357..0000000000
--- a/config.tests/common/avx512/avx512.cpp
+++ /dev/null
@@ -1,103 +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>
-
-#ifndef AVX512WANT
-#  error ".pro file must define AVX512WANT macro to the AVX-512 feature to be tested"
-#endif
-
-// The following checks if __AVXx__ is defined, where x is the value in
-// AVX512WANT
-#define HAS2(x)             __AVX512 ## x ## __
-#define HAS(x)              HAS2(x)
-#if !HAS(AVX512WANT)
-#  error "Feature not supported"
-#endif
-
-int main(int, char**argv)
-{
-    /* AVX512 Foundation */
-    __m512i i;
-    __m512d d;
-    __m512 f;
-    __mmask16 m = ~1;
-    i = _mm512_maskz_loadu_epi32(0, argv);
-    d = _mm512_loadu_pd((double *)argv + 64);
-    f = _mm512_loadu_ps((float *)argv + 128);
-
-#ifdef __AVX512ER__
-    /* AVX512 Exponential and Reciprocal */
-    f =  _mm512_exp2a23_round_ps(f, 8);
-#endif
-#ifdef __AVX512CD__
-    /* AVX512 Conflict Detection */
-    i = _mm512_maskz_conflict_epi32(m, i);
-#endif
-#ifdef __AVX512PF__
-    /* AVX512 Prefetch */
-    _mm512_mask_prefetch_i64scatter_pd(argv, 0xf, i, 2, 2);
-#endif
-#ifdef __AVX512DQ__
-    /* AVX512 Doubleword and Quadword support */
-    m = _mm512_movepi32_mask(i);
-#endif
-#ifdef __AVX512BW__
-    /* AVX512 Byte and Word support */
-    i =  _mm512_mask_loadu_epi8(i, m, argv - 8);
-#endif
-#ifdef __AVX512VL__
-    /* AVX512 Vector Length */
-    __m256i i2 = _mm256_maskz_loadu_epi32(0, argv);
-    _mm256_mask_storeu_epi32(argv + 1, m, i2);
-#endif
-#ifdef __AVX512IFMA__
-    /* AVX512 Integer Fused Multiply-Add */
-    i = _mm512_madd52lo_epu64(i, i, i);
-#endif
-#ifdef __AVX512VBMI__
-    /* AVX512 Vector Byte Manipulation Instructions */
-    i = _mm512_permutexvar_epi8(i, i);
-#endif
-
-    _mm512_mask_storeu_epi64(argv, m, i);
-    _mm512_mask_storeu_ps(argv + 64, m, f);
-    _mm512_mask_storeu_pd(argv + 128, m, d);
-    return 0;
-}
diff --git a/config.tests/common/avx512/avx512.pro b/config.tests/common/avx512/avx512.pro
deleted file mode 100644
index 96dddb14fd..0000000000
--- a/config.tests/common/avx512/avx512.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-SOURCES = avx512.cpp
-CONFIG -= qt dylib release debug_and_release
-CONFIG += debug console
-
-!defined(AVX512, "var"): error("You must set the AVX512 variable!")
-
-varname = QMAKE_CFLAGS_AVX512$$AVX512
-value = $$eval($$varname)
-!defined($$varname, "var"): error("This compiler does not support AVX512")
-
-QMAKE_CXXFLAGS += $$value
-DEFINES += AVX512WANT=$$AVX512
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 6b36c99d96..0000000000
--- a/config.tests/common/f16c/f16c.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES = f16c.cpp
-CONFIG -= qt dylib release debug_and_release
-CONFIG += debug console
-!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 7ae0eaf4a7..0000000000
--- a/config.tests/common/sse2/sse2.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 <emmintrin.h>
-#if defined(__GNUC__) && __GNUC__ < 4 && __GNUC_MINOR__ < 3
-#error GCC < 3.2 is known to create internal compiler errors with our MMX code
-#endif
-
-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 0567eba19d..0000000000
--- a/config.tests/common/sse2/sse2.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES = sse2.cpp
-CONFIG -= qt dylib release debug_and_release
-CONFIG += debug console
-!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 e2e09bac91..0000000000
--- a/config.tests/common/sse3/sse3.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES = sse3.cpp
-CONFIG -= qt dylib release debug_and_release
-CONFIG += debug console
-!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 273c705efc..0000000000
--- a/config.tests/common/sse4_1/sse4_1.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES = sse4_1.cpp
-CONFIG -= qt dylib release debug_and_release
-CONFIG += debug console
-!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 3816fdeae9..0000000000
--- a/config.tests/common/sse4_2/sse4_2.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES = sse4_2.cpp
-CONFIG -= qt dylib release debug_and_release
-CONFIG += debug console
-!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 597b169140..0000000000
--- a/config.tests/common/ssse3/ssse3.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES = ssse3.cpp
-CONFIG -= qt dylib release debug_and_release
-CONFIG += debug console
-!defined(QMAKE_CFLAGS_SSSE3, "var"):error("This compiler does not support SSSE3")
-else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSSE3
diff --git a/config.tests/common/verifyspec/verifyspec.cpp b/config.tests/common/verifyspec/verifyspec.cpp
deleted file mode 100644
index bd5560bf02..0000000000
--- a/config.tests/common/verifyspec/verifyspec.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int main(int, char **) {}
diff --git a/config.tests/common/verifyspec/verifyspec.pro b/config.tests/common/verifyspec/verifyspec.pro
deleted file mode 100644
index 11a280e4ce..0000000000
--- a/config.tests/common/verifyspec/verifyspec.pro
+++ /dev/null
@@ -1,37 +0,0 @@
-SOURCES = verifyspec.cpp
-
-# Provide a function to be used by mkspecs
-defineTest(deviceSanityCheckCompiler) {
-    equals(QMAKE_HOST.os, Windows): \
-        sfx = .exe
-    else: \
-        sfx =
-
-    # Build the compiler filename using the first value in QMAKE_CXX in order to
-    # support tools like ccache, which give QMAKE_CXX values of the form:
-    #     ccache <path_to_compiler>
-    compiler = $$first(QMAKE_CXX)$$sfx
-
-    # Check if the binary exists with an absolute path. Do this check
-    # before the CROSS_COMPILE empty check below to allow the mkspec
-    # to derive the compiler path from other device options.
-    exists($$compiler): return()
-
-    # Check for possible reasons of failure
-    # check if CROSS_COMPILE device-option is set
-    isEmpty(CROSS_COMPILE): \
-        error("CROSS_COMPILE needs to be set via -device-option CROSS_COMPILE=<path>")
-
-    # Check if QMAKE_CXX points to an executable.
-    ensurePathEnv()
-    for (dir, QMAKE_PATH_ENV) {
-        exists($$dir/$${compiler}): \
-            return()
-    }
-
-    # QMAKE_CXX does not point to a compiler.
-    error("Compiler $$QMAKE_CXX not found. Check the value of CROSS_COMPILE -device-option")
-}
-
-defined(qtConfSanitizeMkspec, test): \
-    qtConfSanitizeMkspec()
diff --git a/config.tests/common/xlocalescanprint/qglobal.h b/config.tests/common/xlocalescanprint/qglobal.h
deleted file mode 100644
index 98de822847..0000000000
--- a/config.tests/common/xlocalescanprint/qglobal.h
+++ /dev/null
@@ -1,43 +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$
-**
-****************************************************************************/
-
-#ifndef QGLOBAL_H
-#define QGLOBAL_H
-
-#endif
diff --git a/config.tests/common/xlocalescanprint/xlocalescanprint.cpp b/config.tests/common/xlocalescanprint/xlocalescanprint.cpp
deleted file mode 100644
index 2f1f28f74e..0000000000
--- a/config.tests/common/xlocalescanprint/xlocalescanprint.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$
-**
-****************************************************************************/
-
-#define QT_BEGIN_NAMESPACE
-#define QT_END_NAMESPACE
-
-#ifdef _MSVC_VER
-#define Q_CC_MSVC _MSVC_VER
-#endif
-
-#define QT_NO_DOUBLECONVERSION
-
-#include "../../../src/corelib/tools/qdoublescanprint_p.h"
-
-int main(int argc, char **argv)
-{
-#ifdef _MSVC_VER
-    _locale_t invalidLocale = NULL;
-#else
-    locale_t invalidLocale = NULL;
-#endif
-    double a = 3.4;
-    qDoubleSnprintf(argv[0], 1, invalidLocale, "invalid format", a);
-    qDoubleSscanf(argv[0], invalidLocale, "invalid format", &a, &argc);
-    return 0;
-}
diff --git a/config.tests/common/xlocalescanprint/xlocalescanprint.pro b/config.tests/common/xlocalescanprint/xlocalescanprint.pro
deleted file mode 100644
index a37a01f227..0000000000
--- a/config.tests/common/xlocalescanprint/xlocalescanprint.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = xlocalescanprint.cpp
-CONFIG -= qt
-CONFIG += console