Remove the -qconfig command line argument

This functionality will get replaced by a new and more flexible system
to configure Qt.

Change-Id: I04cf694ab1671eeed39b79a660566595a22f54a7
Reviewed-by: Oswald Buddenhagen <[email protected]>

configure

@@ -610,7 +610,6 @@ CFG_PROFILE=no
 CFG_STRIP=yes
 CFG_GUI=auto # (yes|no|auto)
 CFG_WIDGETS=yes
-CFG_QCONFIG=full
 CFG_DEBUG=auto
 CFG_MYSQL_CONFIG=
 CFG_PSQL_CONFIG=
@@ -1179,9 +1178,6 @@ while [ "$#" -gt 0 ]; do
     testsdir)
         QT_INSTALL_TESTS="$VAL"
         ;;
-    qconfig)
-        CFG_QCONFIG="$VAL"
-        ;;
     qreal)
         CFG_QREAL="$VAL"
         if [ "$CFG_QREAL" = "float" ]; then
@@ -2582,9 +2578,6 @@ Additional options:
     -feature-<feature> .. Compile in <feature>. The available features
                           are described in src/corelib/global/qfeatures.txt
 
-    -qconfig local ...... Use src/corelib/global/qconfig-local.h rather than the
-                          default ($CFG_QCONFIG).
-
     -qreal [double|float] typedef qreal to the specified type. The default is double.
                           Note that changing this flag affects binary compatibility.
 
@@ -3039,21 +3032,6 @@ fi
 # command line and environment validation
 #-------------------------------------------------------------------------------
 
-# update QT_CONFIG to show our current predefined configuration
-CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
-if [ "$CFG_QCONFIG" = full ]; then
-    CFG_QCONFIG_PATH=
-elif [ ! -f "$CFG_QCONFIG_PATH" ]; then
-    CFG_QCONFIG_PATH=`makeabs "${CFG_QCONFIG}"`
-    if [ ! -f "$CFG_QCONFIG_PATH" ]; then
-        echo >&2 "Error: configuration file not found:"
-        echo >&2 "  $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h"
-        echo >&2 "  or"
-        echo >&2 "  $CFG_QCONFIG_PATH"
-        exit 1
-    fi
-fi
-
 if [ "$XPLATFORM_MAC" = "no" -a "$CFG_DEBUG_RELEASE" = "yes" ]; then
     echo
     echo "WARNING: -debug-and-release is not supported outside of Mac OS X."
@@ -6434,17 +6412,6 @@ cat <<EOF
 
 EOF
 
-case "$CFG_QCONFIG" in
-full)
-    echo "/* Everything */"
-    ;;
-*)
-    echo "#ifndef QT_BOOTSTRAPPED"
-    cat "$CFG_QCONFIG_PATH"
-    echo "#endif"
-    ;;
-esac
-
 echo '/* Compile time features */'
 [ '!' -z "$LicenseKeyExt" ] && echo "#define QT_PRODUCT_LICENSEKEY \"$LicenseKeyExt\""
 
@@ -6781,7 +6748,6 @@ done
 if [ -n "$DISABLED_FEATURES" ]; then
     echo "QT_NO_DEFINES = $DISABLED_FEATURES"
 fi
-echo "QT_QCONFIG_PATH = ${CFG_QCONFIG_PATH#$relpath/src/corelib/global/}"
 
 cat <<EOF
 host_build {

qtbase.pro

@@ -121,14 +121,14 @@ FWD_FEATURES_H = \
 write_file($$OUT_PWD/include/QtCore/qfeatures.h, FWD_FEATURES_H)|error("Aborting.")
 
 no_features =
-lines = $$cat($$absolute_path($$QT_QCONFIG_PATH, $$PWD/src/corelib/global), lines)
+lines = $$cat($$OUT_PWD/src/corelib/global/qconfig.h, lines)
 for (line, lines) {
     # We ignore all defines that don't follow the #ifndef + indent pattern.
     # This makes it possible to have unchecked defines which are no features.
     t = $$replace(line, "^$${LITERAL_HASH}  define QT_NO_(\\S+)\\s*$", "\\1")
     !isEqual(t, $$line) {
         isEmpty(features.$${t}.name): \
-            error("$$QT_QCONFIG_PATH disables unknown feature $$t")
+            error("qconfig.h disables unknown feature $$t")
         no_features += $$t
     }
 }