summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2016-05-31 12:02:43 +0200
committerLars Knoll <lars.knoll@theqtcompany.com>2016-05-31 19:15:19 +0000
commitf35560ff12cab7caaa987b1884cea4f36d64d629 (patch)
tree2a64e9d6606a0d0514d8d4e67c61ad9f19f2fd83 /tools/configure
parentd54b77d554f7d321bd21c9acaed8009c54a4a5a4 (diff)
Remove -audio-backend command line option
This option hasn't done anything for quite some time, let's get rid of it. Change-Id: Ic6f2830aaf69ba2d054ce21f0d144a61ddf5d06b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index d82f641d66..139c76bbf1 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -155,7 +155,6 @@ Configure::Configure(int& argc, char** argv) : verbose(0)
dictionary[ "AVX2" ] = "auto";
dictionary[ "AVX512" ] = "auto";
dictionary[ "SYNCQT" ] = "auto";
- dictionary[ "AUDIO_BACKEND" ] = "auto";
dictionary[ "WMF_BACKEND" ] = "no";
dictionary[ "WMSDK" ] = "auto";
dictionary[ "QML_DEBUG" ] = "yes";
@@ -830,10 +829,6 @@ void Configure::parseCmdLine()
dictionary[ "DBUS" ] = "linked";
} else if (configCmdLine.at(i) == "-dbus-runtime") {
dictionary[ "DBUS" ] = "runtime";
- } else if (configCmdLine.at(i) == "-audio-backend") {
- dictionary[ "AUDIO_BACKEND" ] = "yes";
- } else if (configCmdLine.at(i) == "-no-audio-backend") {
- dictionary[ "AUDIO_BACKEND" ] = "no";
} else if (configCmdLine.at(i) == "-wmf-backend") {
dictionary[ "WMF_BACKEND" ] = "yes";
} else if (configCmdLine.at(i) == "-no-wmf-backend") {
@@ -1876,8 +1871,6 @@ bool Configure::displayHelp()
desc("DBUS", "no", "-no-dbus", "Do not compile in D-Bus support.");
desc("DBUS", "linked", "-dbus-linked", "Compile in D-Bus support and link to libdbus-1.\n");
desc("DBUS", "runtime", "-dbus-runtime", "Compile in D-Bus support and load libdbus-1\ndynamically.");
- desc("AUDIO_BACKEND", "no","-no-audio-backend", "Do not compile in the platform audio backend into\nQt Multimedia.");
- desc("AUDIO_BACKEND", "yes","-audio-backend", "Compile in the platform audio backend into Qt Multimedia.\n");
desc("WMF_BACKEND", "no","-no-wmf-backend", "Do not compile in the windows media foundation backend\ninto Qt Multimedia.");
desc("WMF_BACKEND", "yes","-wmf-backend", "Compile in the windows media foundation backend into Qt Multimedia.\n");
desc("QML_DEBUG", "no", "-no-qml-debug", "Do not build the in-process QML debugging support.");
@@ -2145,8 +2138,6 @@ bool Configure::checkAvailability(const QString &part)
&& !QStandardPaths::findExecutable(QStringLiteral("xgConsole.exe")).isEmpty();
} else if (part == "WMSDK") {
available = findFile("wmsdk.h");
- } else if (part == "AUDIO_BACKEND") {
- available = true;
} else if (part == "WMF_BACKEND") {
available = findFile("mfapi.h") && findFile("mf.lib");
} else if (part == "DIRECTWRITE") {
@@ -2317,8 +2308,6 @@ void Configure::autoDetection()
dictionary["DBUS"] = checkAvailability("DBUS") ? "linked" : "runtime";
if (dictionary["QML_DEBUG"] == "auto")
dictionary["QML_DEBUG"] = dictionary["QML"] == "yes" ? "yes" : "no";
- if (dictionary["AUDIO_BACKEND"] == "auto")
- dictionary["AUDIO_BACKEND"] = checkAvailability("AUDIO_BACKEND") ? "yes" : "no";
if (dictionary["WMF_BACKEND"] == "auto")
dictionary["WMF_BACKEND"] = checkAvailability("WMF_BACKEND") ? "yes" : "no";
if (dictionary["WMSDK"] == "auto")
@@ -2772,10 +2761,6 @@ void Configure::generateOutputVars()
else if (dictionary[ "DBUS" ] == "linked")
qtConfig += "dbus dbus-linked";
- // ### Vestige
- if (dictionary["AUDIO_BACKEND"] == "yes")
- qtConfig += "audio-backend";
-
if (dictionary["QML_DEBUG"] == "no")
qtConfig += "no-qml-debug";