From a668c6a6b605ce516f71b9339df53699e85ad248 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Fri, 26 Aug 2016 21:19:12 +0200
Subject: Convert the old feature system

... to the new qmake based configuration system.

This removes the old qfeatures.txt (distributed over configure.json
files) and qfeatures.h (distributed over qconfig-<module>.h files).

qfeatures.prf is gone without replacement, as attempts to use it would
lead to followup errors anyway.

Change-Id: I1598de19db937082283a905b9592d3849d2199d0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 configure | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 81bf483634..789ba4cc74 100755
--- a/configure
+++ b/configure
@@ -753,21 +753,6 @@ while [ "$#" -gt 0 ]; do
     opensource)
         COMMERCIAL_USER="no"
         ;;
-    feature-*)
-        FEATURE=`echo $VAR | sed 's,^[^-]*-\([^-]*\),\1,' | tr 'abcdefghijklmnopqrstuvwxyz-' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-        if grep "^Feature: *${FEATURE} *\$" "$relpath"/src/corelib/global/qfeatures.txt >/dev/null 2>&1; then
-            F=`echo $VAR | sed 's,^[^-]*-\([^-]*\),\1,'`
-            if [ "$VAL" = "no" ]; then
-                F="no-$F"
-            elif [ "$VAL" != "yes" ] && [ "$VAL" != "unknown" ]; then
-                UNKNOWN_OPT=yes
-            fi
-            CFG_FEATURES="$CFG_FEATURES $F"
-        else
-            echo "ERROR: Unknown feature $FEATURE"
-            UNKNOWN_OPT=yes
-        fi
-        ;;
     confirm-license)
         if [ "$VAL" = "yes" ]; then
             OPT_CONFIRM_LICENSE="$VAL"
@@ -1894,7 +1879,6 @@ fi
 
 cat > "$outpath/config.tests/configure.cfg" <<EOF
 # Feature defaults set by configure command line
-config.input.extra_features = $CFG_FEATURES
 config.input.qt_edition = $Edition
 config.input.qt_licheck = $Licheck
 config.input.qt_release_date = $ReleaseDate
-- 
cgit v1.2.3