Remove -graphicssystem (and -runtimegraphicssystem) options from configure.

In a Qt 5 world, these have no relevance, so remove them.

Task-number: QTBUG-23022
Change-Id: I2f52c7aa1fcb8234046dd95b4d702791d20514fa
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/configure b/configure
index 869e398..cfc4cec 100755 (executable)
--- a/configure
+++ b/configure
@@ -825,8 +825,6 @@ OPT_FAST=auto
 OPT_VERBOSE=no
 OPT_HELP=
 CFG_SILENT=no
-CFG_GRAPHICS_SYSTEM=default
-CFG_RUNTIME_SYSTEM=
 CFG_ALSA=auto
 CFG_PULSEAUDIO=auto
 CFG_COREWLAN=auto
@@ -1142,16 +1140,6 @@ while [ "$#" -gt 0 ]; do
         shift
         VAL="$1"
         ;;
-    -graphicssystem)
-       VAR="graphicssystem"
-       shift
-       VAL=$1
-       ;;
-    -runtimegraphicssystem)
-       VAR="runtimegraphicssystem"
-       shift
-       VAL=$1
-       ;;
     -qtlibinfix)
         VAR="qtlibinfix"
         shift
@@ -1401,33 +1389,6 @@ while [ "$#" -gt 0 ]; do
             UNKNOWN_OPT=yes
         fi
         ;;
-    graphicssystem)
-        if [ "$PLATFORM_QWS" = "yes" ]; then
-            echo "Error: Graphics System plugins are not supported on QWS."
-            echo "   On QWS, the graphics system API is part of the QScreen plugin architecture "
-            echo "   rather than existing as a separate plugin."
-            echo ""
-            UNKNOWN_OPT=yes
-        else
-            if  [ "$VAL" = "opengl" ]; then
-                CFG_GRAPHICS_SYSTEM="opengl"
-            elif [ "$VAL" = "openvg" ]; then
-                CFG_GRAPHICS_SYSTEM="openvg"
-            elif [ "$VAL" = "raster" ]; then
-                CFG_GRAPHICS_SYSTEM="raster"
-            elif [ "$VAL" = "runtime" ]; then
-                CFG_GRAPHICS_SYSTEM="runtime"
-            else
-                UNKNOWN_OPT=yes
-            fi
-        fi
-       ;;
-    runtimegraphicssystem)
-        if  [ "$VAL" != "runtime" ]; then
-            CFG_RUNTIME_SYSTEM="$VAL"
-        fi
-       ;;
-
     qvfb) # left for commandline compatibility, not documented
         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
             if [ "$VAL" = "yes" ]; then
@@ -5771,12 +5732,6 @@ if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then
             ;;
         esac
     fi
-
-    # if opengl is disabled and the user specified graphicssystem gl, disable it...
-    if [ "$CFG_GRAPHICS_SYSTEM" = "opengl" ] && [ "$CFG_OPENGL" = "no" ]; then
-       echo "OpenGL Graphics System is disabled due to missing OpenGL support..."
-       CFG_GRAPHICS_SYSTEM=default
-    fi
 fi # X11/MINGW OpenGL
 
 # X11
@@ -6688,17 +6643,6 @@ if [ "$CFG_OPENVG" != "no" ]; then
     fi
 fi
 
-# if openvg is disabled and the user specified graphicssystem vg, disable it...
-if [ "$CFG_GRAPHICS_SYSTEM" = "openvg" ] && [ "$CFG_OPENVG" = "no" ]; then
-    echo "OpenVG Graphics System is disabled due to missing OpenVG support..."
-    CFG_GRAPHICS_SYSTEM=default
-fi
-
-if [ -n "$CFG_RUNTIME_SYSTEM" -a "$CFG_GRAPHICS_SYSTEM" != "runtime" ] || [ "$CFG_RUNTIME_SYSTEM" = "runtime" ]; then
-    echo "Argument to -runtimegraphicssystem is invalid so ignoring..."
-    CFG_RUNTIME_SYSTEM=
-fi
-
 if [ "$CFG_ALSA" = "auto" ]; then
     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/alsa "alsa" $L_FLAGS $I_FLAGS $l_FLAGS; then
         CFG_ALSA=yes
@@ -7864,13 +7808,6 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
 [ "$CFG_SXE" = "no" ]        && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
 [ "$CFG_DBUS" = "no" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
 
-if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then
-    [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
-    [ "$CFG_GRAPHICS_SYSTEM" = "opengl" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENGL"
-    [ "$CFG_GRAPHICS_SYSTEM" = "openvg" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENVG"
-    [ "$CFG_GRAPHICS_SYSTEM" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RUNTIME"
-fi
-
 # ATM we need this define to compile Qt. Remove later!
 QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_S60"
 
@@ -7976,13 +7913,6 @@ cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
 EOF
 fi
 
-if [ -n "$CFG_RUNTIME_SYSTEM" ]; then
-cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
-#define QT_DEFAULT_RUNTIME_SYSTEM "$CFG_RUNTIME_SYSTEM"
-
-EOF
-fi
-
 # avoid unecessary rebuilds by copying only if qconfig.h has changed
 if cmp -s "$outpath/src/corelib/global/qconfig.h" "$outpath/src/corelib/global/qconfig.h.new"; then
     rm -f "$outpath/src/corelib/global/qconfig.h.new"
@@ -8356,7 +8286,6 @@ if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then
     echo "iWMMXt support ......... ${CFG_IWMMXT}"
     echo "NEON support ........... ${CFG_NEON}"
 fi
-[ "${PLATFORM_QWS}" != "yes" -a "${PLATFORM_QPA}" != "yes" ] && echo "Graphics System ........ $CFG_GRAPHICS_SYSTEM"
 echo "IPv6 ifname support .... $CFG_IPV6IFNAME"
 echo "getaddrinfo support .... $CFG_GETADDRINFO"
 echo "getifaddrs support ..... $CFG_GETIFADDRS"

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index ad958e9..a831825 100644 (file)
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -345,7 +345,6 @@ Configure::Configure(int& argc, char** argv)
     dictionary[ "SQL_SQLITE_LIB" ]  = "qt";
     dictionary[ "SQL_SQLITE2" ]     = "no";
     dictionary[ "SQL_IBASE" ]       = "no";
-    dictionary[ "GRAPHICS_SYSTEM" ] = "raster";
 
     QString tmp = dictionary[ "QMAKESPEC" ];
     if (tmp.contains("\\")) {
@@ -1140,25 +1139,6 @@ void Configure::parseCmdLine()
             dictionary[ "MAKE" ] = configCmdLine.at(i);
         }
 
-        else if (configCmdLine.at(i) == "-graphicssystem") {
-            ++i;
-            if (i == argCount)
-                break;
-            QString system = configCmdLine.at(i);
-            if (system == QLatin1String("raster")
-                || system == QLatin1String("opengl")
-                || system == QLatin1String("openvg")
-                || system == QLatin1String("runtime"))
-                dictionary["GRAPHICS_SYSTEM"] = configCmdLine.at(i);
-        }
-
-        else if (configCmdLine.at(i) == "-runtimegraphicssystem") {
-            ++i;
-            if (i == argCount)
-                break;
-            dictionary["RUNTIME_SYSTEM"] = configCmdLine.at(i);
-        }
-
         else if (configCmdLine.at(i).indexOf(QRegExp("^-(en|dis)able-")) != -1) {
             // Scan to see if any specific modules and drivers are enabled or disabled
             for (QStringList::Iterator module = modules.begin(); module != modules.end(); ++module) {
@@ -1581,7 +1561,6 @@ bool Configure::displayHelp()
                     "[-no-multimedia] [-multimedia] [-no-audio-backend] [-audio-backend]\n"
                     "[-no-script] [-script] [-no-scripttools] [-scripttools]\n"
                     "[-no-webkit] [-webkit] [-webkit-debug]\n"
-                    "[-graphicssystem raster|opengl|openvg]\n"
                     "[-no-directwrite] [-directwrite] [-qpa]\n\n", 0, 7);
 
         desc("Installation options:\n\n");
@@ -1683,11 +1662,6 @@ bool Configure::displayHelp()
         desc(                   "-L <librarypath>",     "Add an explicit library path.");
         desc(                   "-l <libraryname>",     "Add an explicit library name, residing in a librarypath.\n");
 #endif
-        desc(                   "-graphicssystem <sys>",   "Specify which graphicssystem should be used.\n"
-                                "Available values for <sys>:");
-        desc("GRAPHICS_SYSTEM", "raster", "",  "  raster - Software rasterizer", ' ');
-        desc("GRAPHICS_SYSTEM", "opengl", "",  "  opengl - Using OpenGL acceleration, experimental!", ' ');
-        desc("GRAPHICS_SYSTEM", "openvg", "",  "  openvg - Using OpenVG acceleration, experimental!\n", ' ');
 
         desc(                   "-help, -h, -?",        "Display this information.\n");
 
@@ -2926,8 +2900,6 @@ void Configure::generateConfigfiles()
 
         tmpStream << endl << "// Compile time features" << endl;
         tmpStream << "#define QT_ARCH_" << dictionary["ARCHITECTURE"].toUpper() << endl;
-        if (dictionary["GRAPHICS_SYSTEM"] == "runtime" && dictionary["RUNTIME_SYSTEM"] != "runtime")
-            tmpStream << "#define QT_DEFAULT_RUNTIME_SYSTEM \"" << dictionary["RUNTIME_SYSTEM"] << "\"" << endl;
 
         QStringList qconfigList;
         if (dictionary["STL"] == "no")                qconfigList += "QT_NO_STL";
@@ -2995,11 +2967,6 @@ void Configure::generateConfigfiles()
         if (dictionary["SQL_SQLITE2"] == "yes")      qconfigList += "QT_SQL_SQLITE2";
         if (dictionary["SQL_IBASE"] == "yes")        qconfigList += "QT_SQL_IBASE";
 
-        if (dictionary["GRAPHICS_SYSTEM"] == "openvg")  qconfigList += "QT_GRAPHICSSYSTEM_OPENVG";
-        if (dictionary["GRAPHICS_SYSTEM"] == "opengl")  qconfigList += "QT_GRAPHICSSYSTEM_OPENGL";
-        if (dictionary["GRAPHICS_SYSTEM"] == "raster")  qconfigList += "QT_GRAPHICSSYSTEM_RASTER";
-        if (dictionary["GRAPHICS_SYSTEM"] == "runtime") qconfigList += "QT_GRAPHICSSYSTEM_RUNTIME";
-
         qconfigList.sort();
         for (int i = 0; i < qconfigList.count(); ++i)
             tmpStream << addDefine(qconfigList.at(i));
@@ -3256,7 +3223,6 @@ void Configure::displayConfig()
     cout << "V8 support.................." << dictionary[ "V8" ] << endl;
     cout << "QtScript support............" << dictionary[ "SCRIPT" ] << endl;
     cout << "QtScriptTools support......." << dictionary[ "SCRIPTTOOLS" ] << endl;
-    cout << "Graphics System............." << dictionary[ "GRAPHICS_SYSTEM" ] << endl;
     cout << "Qt3 compatibility..........." << dictionary[ "QT3SUPPORT" ] << endl;
     cout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl << endl;