Remove all Multimedia related configuration options from qtbase

They live in qtmultimedia now.

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

8 files changed, 0 insertions, 250 deletions

diff --git a/config.tests/unix/alsa/alsa.pro b/config.tests/unix/alsa/alsa.pro
deleted file mode 100644
index 211e9bc899..0000000000
--- a/config.tests/unix/alsa/alsa.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = alsatest.cpp
-CONFIG -= qt dylib
diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp
deleted file mode 100644
index 1b2b141b79..0000000000
--- a/config.tests/unix/alsa/alsatest.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 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 <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/unix/gstreamer/gstreamer.cpp b/config.tests/unix/gstreamer/gstreamer.cpp
deleted file mode 100644
index 8076458b8b..0000000000
--- a/config.tests/unix/gstreamer/gstreamer.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 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 GST_USE_UNSTABLE_API
-
-#include <gst/gst.h>
-
-int main(int, char**)
-{
-    return 0;
-}
diff --git a/config.tests/unix/gstreamer/gstreamer.pro b/config.tests/unix/gstreamer/gstreamer.pro
deleted file mode 100644
index 7b6fbb4d75..0000000000
--- a/config.tests/unix/gstreamer/gstreamer.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-SOURCES += gstreamer.cpp
-
-CONFIG -= qt
-
diff --git a/config.tests/unix/pulseaudio/pulseaudio.cpp b/config.tests/unix/pulseaudio/pulseaudio.cpp
deleted file mode 100644
index 7b71567ae5..0000000000
--- a/config.tests/unix/pulseaudio/pulseaudio.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 <pulse/pulseaudio.h>
-#include <pulse/glib-mainloop.h>
-
-#if !defined(PA_API_VERSION) || PA_API_VERSION-0 != 12
-# error "Incompatible PulseAudio API version"
-#endif
-#if !PA_CHECK_VERSION(0,9,0)
-# error "PulseAudio version too old"
-#endif
-
-int main(int, char **)
-{
-    const char *headers = pa_get_headers_version();
-    const char *library = pa_get_library_version();
-    pa_glib_mainloop_new(0);
-    return (headers - library) * 0;
-}
diff --git a/config.tests/unix/pulseaudio/pulseaudio.pro b/config.tests/unix/pulseaudio/pulseaudio.pro
deleted file mode 100644
index 5e36c0aa81..0000000000
--- a/config.tests/unix/pulseaudio/pulseaudio.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES = pulseaudio.cpp
-CONFIG -= qt
diff --git a/config_help.txt b/config_help.txt
index 5e0d36a41f..5725e9213f 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -289,12 +289,3 @@ Database options:
                          [all auto]
                          MYSQL_PATH= PSQL_LIBS= SYBASE= SYBASE_LIBS=
   -sqlite .............. Select used sqlite3 [system/qt]
-
-Multimedia options:
-
-  -pulseaudio .......... Enable PulseAudio support [auto]
-  -alsa ................ Enable ALSA support [auto]
-  -no-gstreamer ........ Disable support for GStreamer
-  -gstreamer [version] . Enable GStreamer support [auto]
-                         With no parameter, 1.0 is tried first, then 0.10.
-  -wmf-backend ......... Enable WMF support [no] (Windows only)
diff --git a/configure.json b/configure.json
index e266fa918c..5d5af7d035 100644
--- a/configure.json
+++ b/configure.json
@@ -56,8 +56,6 @@
             "android-toolchain-version": "string",
 
             "accessibility": "boolean",
-            "alsa": "boolean",
-            "audio-backend": "boolean",
             "avx": "boolean",
             "avx2": "boolean",
             "avx512": { "type": "boolean", "name": "avx512f" },
@@ -81,7 +79,6 @@
             "gcc-sysroot": "boolean",
             "gcov": "boolean",
             "gnumake": { "type": "boolean", "name": "GNUmake" },
-            "gstreamer": { "type": "optionalString", "values": [ "no", "yes", "0.10", "1.0" ] },
             "gui": "boolean",
             "headersclean": "boolean",
             "host-option": "string",
@@ -102,7 +99,6 @@
             "platform": "string",
             "plugin-manifests": "boolean",
             "profile": "boolean",
-            "pulseaudio": "boolean",
             "qml-debug": "boolean",
             "qreal": "string",
             "qtlibinfix": { "type": "string", "name": "qt_libinfix" },
@@ -133,7 +129,6 @@
             "warnings-are-errors": { "type": "boolean", "name": "warnings_are_errors" },
             "Werror": { "type": "boolean", "name": "warnings_are_errors" },
             "widgets": "boolean",
-            "wmf-backend": "boolean",
             "xplatform": "string",
             "zlib": { "type": "enum", "name": "system-zlib", "values": { "system": "yes", "qt": "no" } }
         },
@@ -157,39 +152,6 @@
                 { "libs": "-lz", "condition": "!config.msvc" }
             ]
         },
-        "alsa": {
-            "label": "ALSA",
-            "export": "",
-            "test": "unix/alsa",
-            "sources": [
-                "-lasound"
-            ]
-        },
-        "pulseaudio": {
-            "label": "PulseAudio >= 0.9.10",
-            "test": "unix/pulseaudio",
-            "sources": [
-                { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" }
-            ]
-        },
-        "gstreamer_1_0": {
-            "label": "GStreamer 1.0",
-            "export": "",
-            "test": "unix/gstreamer",
-            "sources": [
-                { "type": "pkgConfig",
-                  "args": "gstreamer-1.0 gstreamer-base-1.0 gstreamer-audio-1.0 gstreamer-video-1.0 gstreamer-pbutils-1.0" }
-            ]
-        },
-        "gstreamer_0_10": {
-            "label": "GStreamer 0.10",
-            "export": "",
-            "test": "unix/gstreamer",
-            "sources": [
-                { "type": "pkgConfig",
-                  "args": "gstreamer-0.10 gstreamer-base-0.10 gstreamer-audio-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10" }
-            ]
-        },
         "dbus": {
             "label": "D-Bus >= 1.2",
             "test": "unix/dbus",
@@ -451,11 +413,6 @@
             "label": "IncrediBuild",
             "type": "files",
             "files": [ "BuildConsole.exe", "xgConsole.exe" ]
-        },
-        "wmf": {
-            "label": "WMF",
-            "type": "files",
-            "files": [ "mfapi.h", "mf.lib" ]
         }
     },
 
@@ -899,11 +856,6 @@
                 { "type": "define", "name": "QT_COMPILER_SUPPORTS_NEON", "value": 1 }
             ]
         },
-        "alsa": {
-            "label": "ALSA",
-            "condition": "libs.alsa",
-            "output": [ "feature" ]
-        },
         "mremap": {
             "label": "mremap()",
             "condition": "tests.mremap",
@@ -923,11 +875,6 @@
             "label": "Accessibility",
             "output": [ "publicFeature", "feature" ]
         },
-        "pulseaudio": {
-            "label": "PulseAudio",
-            "condition": "libs.pulseaudio",
-            "output": [ "feature" ]
-        },
         "system-zlib": {
             "label": "Using system zlib",
             "condition": "libs.zlib",
@@ -985,24 +932,6 @@
             "condition": "libs.libudev",
             "output": [ "privateFeature" ]
         },
-        "gstreamer-1_0": {
-            "label": "GStreamer 1.0",
-            "disable": "input.gstreamer == '0.10' || input.gstreamer == 'no'",
-            "enable": "input.gstreamer == '1.0'",
-            "condition": "libs.gstreamer_1_0",
-            "output": [ { "type": "publicQtConfig", "name": "gstreamer-1.0" } ]
-        },
-        "gstreamer-0_10": {
-            "label": "GStreamer 0.10",
-            "disable": "input.gstreamer == 'no'",
-            "enable": "input.gstreamer == '0.10'",
-            "condition": "!features.gstreamer-1_0 && libs.gstreamer_0_10",
-            "output": [ { "type": "publicQtConfig", "name": "gstreamer-0.10" } ]
-        },
-        "audio-backend": {
-            "label": "Audio backend",
-            "output": [ "publicQtConfig" ]
-        },
         "qml-debug": {
             "label": "QML debugging",
             "output": [ { "type": "publicQtConfig", "negative": true } ]
@@ -1029,13 +958,6 @@
             "autoDetect": false,
             "condition": "!features.shared",
             "output": [ "publicConfig", "publicQtConfig" ]
-        },
-        "wmf-backend": {
-            "label": "Windows Media Foundation backend for Qt Multimedia",
-            "emitIf": "config.win32",
-            "autoDetect": false,
-            "condition": "tests.wmf",
-            "output": [ "publicQtConfig" ]
         }
     },
 
@@ -1181,11 +1103,7 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5
             "section": "Support enabled for",
             "entries": [
                 "accessibility",
-                "alsa",
-                "gstreamer-0_10",
-                "gstreamer-1_0",
                 "pkg-config",
-                "pulseaudio",
                 "qml-debug",
                 "libudev",
                 "system-zlib"