Merge "Merge remote-tracking branch 'origin/5.14' into wip/qt6"wip/qt6

16 files changed, 0 insertions, 324 deletions

diff --git a/config.tests/alsa/alsa.pro b/config.tests/alsa/alsa.pro
deleted file mode 100644
index 7322b6fb8..000000000
--- a/config.tests/alsa/alsa.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = alsatest.cpp
-
diff --git a/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp
deleted file mode 100644
index 0b0ca71ec..000000000
--- a/config.tests/alsa/alsatest.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** 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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <alsa/asoundlib.h>
-#if SND_LIB_VERSION < 0x1000a  // 1.0.10
-#error "Alsa version found too old, require >= 1.0.10"
-#endif
-
-int main(int argc, char **argv)
-{
-}
-
diff --git a/config.tests/glibc/glibc.cpp b/config.tests/glibc/glibc.cpp
deleted file mode 100644
index e78994b64..000000000
--- a/config.tests/glibc/glibc.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** 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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <features.h>
-
-#if __GLIBC__ < 2 || __GLIBC_MINOR__ < 27
-#error glibc versions below 2.27 are not supported
-#endif
-
-int main(int , char **) {
-  return 0;
-}
-
diff --git a/config.tests/glibc/glibc.pro b/config.tests/glibc/glibc.pro
deleted file mode 100644
index f72bfb804..000000000
--- a/config.tests/glibc/glibc.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET = glibc
-SOURCES = glibc.cpp
-CONFIG -= qt
-CONFIG += console
-
diff --git a/config.tests/khr/khr.cpp b/config.tests/khr/khr.cpp
deleted file mode 100644
index df81bd6b2..000000000
--- a/config.tests/khr/khr.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** 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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <KHR/khrplatform.h>
-
-int main(int, char **)
-{
-    return 0;
-}
diff --git a/config.tests/khr/khr.pro b/config.tests/khr/khr.pro
deleted file mode 100644
index b8e935f5a..000000000
--- a/config.tests/khr/khr.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
-!isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
-
-CONFIG-=qt
-
-linux:SOURCES += khr.cpp
diff --git a/config.tests/libvpx/libvpx.cpp b/config.tests/libvpx/libvpx.cpp
deleted file mode 100644
index 06c34476b..000000000
--- a/config.tests/libvpx/libvpx.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** 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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <vpx/vpx_encoder.h>
-
-int main(int, char **)
-{
-    vpx_codec_cx_pkt pkt;
-    // Members added (as ints) by
-    // https://chromium-review.googlesource.com/c/webm/libvpx/+/798222
-    // And changed to int arrays by
-    //  https://chromium-review.googlesource.com/c/webm/libvpx/+/879089
-    pkt.data.frame.width[0] = 0u;
-    pkt.data.frame.height[0] = 0u;
-    return 0;
-}
diff --git a/config.tests/libvpx/libvpx.pro b/config.tests/libvpx/libvpx.pro
deleted file mode 100644
index 13ce13647..000000000
--- a/config.tests/libvpx/libvpx.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-SOURCES += libvpx.cpp
-CONFIG += link_pkgconfig
-PKGCONFIG += vpx
-CONFIG -= qt
diff --git a/config.tests/re2/re2.cpp b/config.tests/re2/re2.cpp
deleted file mode 100644
index bd3b80a82..000000000
--- a/config.tests/re2/re2.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** 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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <re2/re2.h>
-
-int main(int, char **)
-{
-    std::string s("dummytest");
-    RE2 re2(s);
-    return 0;
-}
diff --git a/config.tests/re2/re2.pro b/config.tests/re2/re2.pro
deleted file mode 100644
index b1a26d918..000000000
--- a/config.tests/re2/re2.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES += re2.cpp
-LIBS += -lre2
-CONFIG -= qt
diff --git a/config.tests/snappy/snappy.cpp b/config.tests/snappy/snappy.cpp
deleted file mode 100644
index d52c73bd0..000000000
--- a/config.tests/snappy/snappy.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** 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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <snappy.h>
-
-int main(int, char **)
-{
-    snappy::Source* src = 0;
-    snappy::Sink* sink = 0;
-    return 0;
-}
diff --git a/config.tests/snappy/snappy.pro b/config.tests/snappy/snappy.pro
deleted file mode 100644
index 890174a13..000000000
--- a/config.tests/snappy/snappy.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-linux:SOURCES += snappy.cpp
-LIBS += -lsnappy
-CONFIG -= qt
diff --git a/config.tests/winversion/winversion.cpp b/config.tests/winversion/winversion.cpp
deleted file mode 100644
index e9a4cff59..000000000
--- a/config.tests/winversion/winversion.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** 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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#if !defined(__clang__) && _MSC_FULL_VER < 191426428
-#error unsupported Visual Studio version
-#endif
-
-int main(int, char **)
-{
-    return 0;
-}
diff --git a/config.tests/winversion/winversion.pro b/config.tests/winversion/winversion.pro
deleted file mode 100644
index dc501a2f6..000000000
--- a/config.tests/winversion/winversion.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG-=qt
-CONFIG+=console
-win32: SOURCES += winversion.cpp
diff --git a/config.tests/xml2/xml2.cpp b/config.tests/xml2/xml2.cpp
deleted file mode 100644
index 497653d9c..000000000
--- a/config.tests/xml2/xml2.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** 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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <libxml/xmlversion.h>
-#if !defined(LIBXML_ICU_ENABLED)
-#error "libxml icu not enabled"
-#endif
-
-int main(int argc, char **argv)
-{
-}
-
diff --git a/config.tests/xml2/xml2.pro b/config.tests/xml2/xml2.pro
deleted file mode 100644
index 6fad45f2f..000000000
--- a/config.tests/xml2/xml2.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = xml2.cpp
-CONFIG += link_pkgconfig
-PKGCONFIG += libxml-2.0