diff options
| -rwxr-xr-x | configure | 17 | ||||
| -rw-r--r-- | mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf | 4 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 15 |
3 files changed, 2 insertions, 34 deletions
@@ -665,7 +665,6 @@ CFG_BUILD_PARTS="" CFG_NOBUILD_PARTS="" CFG_SKIP_MODULES="" CFG_COMPILE_EXAMPLES=yes -CFG_AUDIO_BACKEND=auto CFG_QML_DEBUG=yes CFG_PKGCONFIG=auto CFG_STACK_PROTECTOR_STRONG=auto @@ -2055,13 +2054,6 @@ while [ "$#" -gt 0 ]; do silent) CFG_SILENT="$VAL" ;; - audio-backend) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_AUDIO_BACKEND="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; icu) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_ICU="$VAL" @@ -5423,10 +5415,6 @@ if [ "$CFG_ALSA" = "auto" ]; then fi fi -if [ "$CFG_AUDIO_BACKEND" = "auto" ]; then - CFG_AUDIO_BACKEND=yes -fi - # detect GStreamer support if [ "$CFG_GSTREAMER" = "auto" ] || [ "$CFG_GSTREAMER" = "yes" ]; then if compileTest unix/gstreamer "GStreamer 1.0" -config gst-1.0; then @@ -5812,11 +5800,6 @@ CFG_CONCURRENT="yes" QT_CONFIG="$QT_CONFIG concurrent" # ### Vestige -if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then - QT_CONFIG="$QT_CONFIG audio-backend" -fi - -# ### Vestige if [ "$CFG_WEBKIT" = "debug" ]; then QMAKE_CONFIG="$QMAKE_CONFIG webkit-debug" fi diff --git a/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf b/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf index 71ff90c9f8..99b8f22f97 100644 --- a/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf +++ b/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf @@ -4,14 +4,14 @@ # A typical configure line looks like this: # <path-to-qt-src>/configure -opensource -confirm-license -release -make libs -make examples -optimized-qmake # -platform linux-g++-64 -device linux-arm-hisilicon-hix5hd2-g++ -device-option CROSS_COMPILE=arm-linux-gnueabihf- -# -opengl es2 -no-qml-debug -no-directfb -no-kms -no-xcb -no-alsa -no-audio-backend -qt-zlib -qt-libjpeg -qt-libpng +# -opengl es2 -no-qml-debug -no-directfb -no-kms -no-xcb -no-alsa -qt-zlib -qt-libjpeg -qt-libpng # -no-icu -no-nis -sysroot <path-to-rootfs> -extprefix <path-to-targetinstall> -hostprefix <path-to-hostinstall> # -prefix <path-to-prefix> # # such as # ./configure -opensource -confirm-license -release -make libs -make examples -optimized-qmake # -platform linux-g++-64 -device linux-arm-hisilicon-hix5hd2-g++ -device-option CROSS_COMPILE=arm-linux-gnueabihf- -# -opengl es2 -no-qml-debug -no-directfb -no-kms -no-xcb -no-alsa -no-audio-backend -qt-zlib -qt-libjpeg -qt-libpng +# -opengl es2 -no-qml-debug -no-directfb -no-kms -no-xcb -no-alsa -qt-zlib -qt-libjpeg -qt-libpng # -no-icu -no-nis -sysroot /home/abc/project/sysbase # -extprefix /home/abc/project/sysbase/qt_install # -hostprefix /home/abc/project/qtdir/qtbase_hostinstall 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"; |