diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-03-20 22:35:48 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-04-07 16:17:54 +0000 |
commit | 921e5193cd38cae307f9fa0b314e6f1649962c73 (patch) | |
tree | 4c5a19b1884c3dd61a75366df69f08182a5ee122 | |
parent | 84d3a21c9efe7efb2cce6d3bd14af1f9580b1108 (diff) |
Remove obsolete command line args to configure
Change-Id: I6b185d6e2c33ac28be302895da34123cc56b0905
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rwxr-xr-x | configure | 36 |
1 files changed, 0 insertions, 36 deletions
@@ -664,8 +664,6 @@ CFG_CPUFEATURES= # Host architecture, same as CFG_ARCH when not cross-compiling CFG_HOST_ARCH= CFG_HOST_CPUFEATURES= -# Set when the -arch or -host-arch arguments are used -OPT_OBSOLETE_HOST_ARG=no CFG_USE_GNUMAKE=no CFG_XINPUT2=auto @@ -690,7 +688,6 @@ CFG_KMS=auto CFG_MIRCLIENT=auto CFG_LIBUDEV=auto CFG_LIBINPUT=auto -CFG_OBSOLETE_WAYLAND=no CFG_EVDEV=auto CFG_TSLIB=auto CFG_NIS=auto @@ -1290,9 +1287,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - arch|host-arch) - OPT_OBSOLETE_HOST_ARG=yes - ;; harfbuzz) [ "$VAL" = "yes" ] && VAL=qt if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then @@ -1749,9 +1743,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - wayland) - CFG_OBSOLETE_WAYLAND=yes - ;; eglfs) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_EGLFS="$VAL" @@ -7174,33 +7165,6 @@ EOF fi #------------------------------------------------------------------------------- -# check if the user passed the obsoleted -wayland or -no-wayland flag -#------------------------------------------------------------------------------- -if [ "$CFG_OBSOLETE_WAYLAND" = "yes" ]; then -cat <<EOF - - NOTICE: The -wayland and -no-wayland flags are now obsolete - - All configuring of QtWayland plugin and QtCompositor happens in the module -EOF -fi - -#------------------------------------------------------------------------------- -# check if the user passed the obsoleted -arch or -host-arch options -#------------------------------------------------------------------------------- -if [ "$OPT_OBSOLETE_HOST_ARG" = "yes" ]; then -cat <<EOF - - NOTICE: The -arch and -host-arch options are obsolete. - - Qt now detects the target and host architectures based on compiler - output. Qt will be built using $CFG_ARCH for the target architecture - and $CFG_HOST_ARCH for the host architecture (note that these two - will be the same unless you are cross-compiling). -EOF -fi - -#------------------------------------------------------------------------------- # finally save the executed command to another script #------------------------------------------------------------------------------- if [ `basename $0` != "config.status" ]; then |