Remove openvg tests from configure

We're not currently supporting OpenVG anywhere, so remove
those tests. If we need them in the future, it's easy to get
them back.

Change-Id: I06c0f9f3b3ecaa10a51de84c3059d4eee3a29fad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

config.tests/unix/openvg/openvg.cpp

@@ -1,55 +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$
-**
-****************************************************************************/
-
-// There is some variation in OpenVG engines as to what case
-// the VG includes use.  The Khronos reference implementation
-// for OpenVG 1.1 uses upper case, so we treat that as canonical.
-#if defined(QT_LOWER_CASE_VG_INCLUDES)
-#include <vg/openvg.h>
-#else
-#include <VG/openvg.h>
-#endif
-
-int main(int, char **)
-{
-    VGint i;
-    i = 2;
-    vgFlush();
-    return 0;
-}

config.tests/unix/openvg/openvg.pro

@@ -1,19 +0,0 @@
-SOURCES += openvg.cpp
-
-!isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG
-!isEmpty(QMAKE_LIBDIR_OPENVG): LIBS += -L$$QMAKE_LIBDIR_OPENVG
-!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG
-
-# Some OpenVG engines (e.g. ShivaVG) are implemented on top of OpenGL.
-# Add the extra includes and libraries for that case.
-openvg_on_opengl {
-    !isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
-    !isEmpty(QMAKE_LIBDIR_OPENGL): LIBS += -L$$QMAKE_LIBDIR_OPENGL
-    !isEmpty(QMAKE_LIBS_OPENGL): LIBS += $$QMAKE_LIBS_OPENGL
-}
-
-lower_case_includes {
-    DEFINES += QT_LOWER_CASE_VG_INCLUDES
-}
-
-CONFIG -= qt

config.tests/unix/shivavg/shivavg.cpp

@@ -1,49 +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 <vg/openvg.h>
-
-int main(int, char **)
-{
-    VGint i;
-    i = 2;
-    vgFlush();
-    vgDestroyContextSH();
-    return 0;
-}

config.tests/unix/shivavg/shivavg.pro

@@ -1,11 +0,0 @@
-SOURCES += shivavg.cpp
-
-!isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG
-!isEmpty(QMAKE_LIBDIR_OPENVG): LIBS += -L$$QMAKE_LIBDIR_OPENVG
-!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG
-
-!isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
-!isEmpty(QMAKE_LIBDIR_OPENGL): LIBS += -L$$QMAKE_LIBDIR_OPENGL
-!isEmpty(QMAKE_LIBS_OPENGL): LIBS += $$QMAKE_LIBS_OPENGL
-
-CONFIG -= qt

configure

@@ -637,10 +637,6 @@ CFG_XRANDR=runtime
 CFG_XRENDER=auto
 CFG_MITSHM=auto
 CFG_OPENGL=auto
-CFG_OPENVG=auto
-CFG_OPENVG_LC_INCLUDES=no
-CFG_OPENVG_SHIVA=auto
-CFG_OPENVG_ON_OPENGL=auto
 CFG_EGL=auto
 CFG_EGL_X=auto
 CFG_DOUBLECONVERSION=auto
@@ -998,16 +994,6 @@ while [ "$#" -gt 0 ]; do
             VAL=$1
         fi
 	;;
-    -openvg)
-        VAR=openvg
-        # this option may or may not be followed by an argument
-        if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then
-            VAL=yes
-        else
-            shift;
-            VAL=$1
-        fi
-        ;;
     -gstreamer)
         VAR=gstreamer
         # this option may or may not be followed by an argument
@@ -1282,13 +1268,6 @@ while [ "$#" -gt 0 ]; do
             UNKNOWN_OPT=yes
         fi
         ;;
-    openvg)
-        if [ "$VAL" = "auto" ] || [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
-            CFG_OPENVG="$VAL"
-        else
-            UNKNOWN_OPT=yes
-        fi
-        ;;
     nomake)
         if [ -n "${QT_ALL_BUILD_PARTS%%* $VAL *}" ]; then
             echo "Unknown part $VAL passed to -nomake." >&2
@@ -6194,44 +6173,6 @@ if [ "$CFG_PCRE" != "qt" ]; then
     fi
 fi
 
-# detect OpenVG support
-if [ "$CFG_OPENVG" != "no" ]; then
-    if compileTest unix/openvg "OpenVG"; then
-        if [ "$CFG_OPENVG" = "auto" ]; then
-            CFG_OPENVG=yes
-        fi
-    elif compileTest unix/openvg "OpenVG" -config openvg_on_opengl; then
-        if [ "$CFG_OPENVG" = "auto" ]; then
-            CFG_OPENVG=yes
-        fi
-        CFG_OPENVG_ON_OPENGL=yes
-    elif compileTest unix/openvg "OpenVG (lc includes)" -config lower_case_includes; then
-        if [ "$CFG_OPENVG" = "auto" ]; then
-            CFG_OPENVG=yes
-        fi
-        CFG_OPENVG_LC_INCLUDES=yes
-    elif compileTest unix/openvg "OpenVG (lc includes)" -config "openvg_on_opengl lower_case_includes"; then
-        if [ "$CFG_OPENVG" = "auto" ]; then
-            CFG_OPENVG=yes
-        fi
-        CFG_OPENVG_LC_INCLUDES=yes
-        CFG_OPENVG_ON_OPENGL=yes
-    else
-        if [ "$CFG_OPENVG" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
-            echo "$CFG_OPENVG was specified for OpenVG but cannot be enabled due to functionality tests!"
-            echo " Turn on verbose messaging (-v) to $0 to see the final report."
-            echo " If you believe this message is in error you may use the continue"
-            echo " switch (-continue) to $0 to continue."
-            exit 101
-        else
-            CFG_OPENVG=no
-        fi
-    fi
-    if [ "$CFG_OPENVG" = "yes" ] && compileTest unix/shivavg "ShivaVG"; then
-        CFG_OPENVG_SHIVA=yes
-    fi
-fi
-
 if [ "$CFG_ALSA" = "auto" ]; then
     if compileTest unix/alsa "alsa"; then
         CFG_ALSA=yes
@@ -6356,23 +6297,6 @@ if [ "$CFG_EGLFS_VIV" = "yes" ]; then
     fi
 fi
 
-# enable openvg
-if [ "$CFG_OPENVG" = "no" ]; then
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENVG"
-else
-    QT_CONFIG="$QT_CONFIG openvg"
-    if [ "$CFG_OPENVG_LC_INCLUDES" = "yes" ]; then
-        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_LOWER_CASE_VG_INCLUDES"
-    fi
-    if [ "$CFG_OPENVG_ON_OPENGL" = "yes" ]; then
-        QT_CONFIG="$QT_CONFIG openvg_on_opengl"
-    fi
-    if [ "$CFG_OPENVG_SHIVA" = "yes" ]; then
-        QT_CONFIG="$QT_CONFIG shivavg"
-        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_SHIVAVG"
-    fi
-fi
-
 # enable opengl
 if [ "$CFG_OPENGL" = "no" ]; then
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL"
@@ -7309,7 +7233,6 @@ report_support "  NIS ...................." "$CFG_NIS"
 report_support "  OpenGL / OpenVG:"
 report_support "    EGL .................." "$CFG_EGL"
 report_support "    OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.0+"
-report_support "    OpenVG ..............." "$CFG_OPENVG-$CFG_OPENVG_SHIVA" yes-yes "ShivaVG" yes-no "native"
 report_support "  PCRE ..................." "$CFG_PCRE" yes "system library" qt "bundled copy"
 if [ -n "$PKG_CONFIG" ]; then
     report_support "  pkg-config ............. yes"

tools/configure/configureapp.cpp

@@ -264,7 +264,6 @@ Configure::Configure(int& argc, char** argv) : verbose(0)
     dictionary[ "ACCESSIBILITY" ]   = "yes";
     dictionary[ "OPENGL" ]          = "yes";
     dictionary[ "OPENGL_ES_2" ]     = "yes";
-    dictionary[ "OPENVG" ]          = "no";
     dictionary[ "SSL" ]             = "auto";
     dictionary[ "OPENSSL" ]         = "auto";
     dictionary[ "LIBPROXY" ]        = "auto";
@@ -746,13 +745,6 @@ void Configure::parseCmdLine()
             }
         }
 
-        // OpenVG Support -------------------------------------------
-        else if (configCmdLine.at(i) == "-openvg") {
-            dictionary[ "OPENVG" ]    = "yes";
-        } else if (configCmdLine.at(i) == "-no-openvg") {
-            dictionary[ "OPENVG" ]    = "no";
-        }
-
         // Databases ------------------------------------------------
         else if (configCmdLine.at(i) == "-qt-sql-mysql")
             dictionary[ "SQL_MYSQL" ] = "yes";
@@ -1680,7 +1672,6 @@ void Configure::applySpecSpecifics()
         dictionary[ "FREETYPE" ]            = "yes";
         dictionary[ "OPENGL" ]              = "yes";
         dictionary[ "OPENGL_ES_2" ]         = "yes";
-        dictionary[ "OPENVG" ]              = "no";
         dictionary[ "SSL" ]                 = "yes";
         dictionary[ "OPENSSL" ]             = "no";
         dictionary[ "DBUS" ]                = "no";
@@ -1884,8 +1875,6 @@ bool Configure::displayHelp()
         desc("", "no", "",                              "  dynamic - Enable support for dynamically loaded OpenGL (either desktop or ES)", ' ');
         desc("OPENGL_ES_2",  "yes", "",                 "  es2 - Enable support for OpenGL ES 2.0\n", ' ');
 
-        desc("OPENVG", "no","-no-openvg",               "Disables OpenVG functionality.");
-        desc("OPENVG", "yes","-openvg",                 "Enables OpenVG functionality.\n");
         desc(                   "-force-asserts",       "Activate asserts in release mode.\n");
         desc(                   "-platform <spec>",     "The operating system and compiler you are building on.\n(default %QMAKESPEC%)\n");
         desc(                   "-xplatform <spec>",    "The operating system and compiler you are cross compiling to.\n");
@@ -2995,11 +2984,6 @@ void Configure::generateOutputVars()
         qtConfig += "egl";
     }
 
-    if (dictionary["OPENVG"] == "yes") {
-        qtConfig += "openvg";
-        qtConfig += "egl";
-    }
-
     if (dictionary[ "SSL" ] == "yes")
         qtConfig += "ssl";
 
@@ -3757,7 +3741,6 @@ void Configure::generateConfigfiles()
         if (dictionary["WIDGETS"] == "no")           qconfigList += "QT_NO_WIDGETS";
         if (dictionary["GUI"] == "no")               qconfigList += "QT_NO_GUI";
         if (dictionary["OPENGL"] == "no")            qconfigList += "QT_NO_OPENGL";
-        if (dictionary["OPENVG"] == "no")            qconfigList += "QT_NO_OPENVG";
         if (dictionary["SSL"] == "no")               qconfigList += "QT_NO_SSL";
         if (dictionary["OPENSSL"] == "no")           qconfigList += "QT_NO_OPENSSL";
         if (dictionary["OPENSSL"] == "linked")       qconfigList += "QT_LINKED_OPENSSL";
@@ -3917,7 +3900,6 @@ void Configure::displayConfig()
     sout << "eventfd(7) support.........." << dictionary[ "QT_EVENTFD" ] << endl;
     sout << "Glib support................" << dictionary[ "QT_GLIB" ] << endl;
     sout << "CUPS support................" << dictionary[ "QT_CUPS" ] << endl;
-    sout << "OpenVG support.............." << dictionary[ "OPENVG" ] << endl;
     sout << "SSL support................." << dictionary[ "SSL" ] << endl;
     sout << "OpenSSL support............." << dictionary[ "OPENSSL" ] << endl;
     sout << "libproxy support............" << dictionary[ "LIBPROXY" ] << endl;