nuke configure -host-option

in its current form, it was introduced only in 5.7, mostly as a side
effect of -external-hostbindir (which is now handled differently).
it only ever worked for the macOS and MinGW specs, as a side effect of
them supporting -sdk and -device-option (for good reasons), and was
supported only by the unix configure. it's not believed to be really
useful and complicates matters somewhat, so get rid of it again.

should it ever become actually relevant, it can be re-introduced
properly, probably along with a -host-sdk option for macOS.

Change-Id: Ib078469ea39deb821c7b6a8c67fda9e1a95fedf5
Reviewed-by: Lars Knoll <[email protected]>

config_help.txt

@@ -85,7 +85,6 @@ Build options:
   -framework ........... Build Qt framework bundles [yes] (Apple only)
 
   -platform <target> ... Select host mkspec [detected]
-  -host-option <key=value> ..... Add option for the host mkspec
   -xplatform <target> .. Select target mkspec when cross-compiling [PLATFORM]
   -device <name> ....... Cross-compile for device <name>
   -device-option <key=value> ... Add option for the device mkspec

configure

@@ -123,10 +123,7 @@ IFS=$SAVED_IFS
 
 # initialize global variables
 DEVICE_VARS_FILE=.device.vars
-HOST_VARS_FILE=.host.vars
-
 :> "$DEVICE_VARS_FILE"
-:> "$HOST_VARS_FILE"
 
 #-------------------------------------------------------------------------------
 # utility functions
@@ -169,6 +166,9 @@ expandQMakeConf()
         ;;
         *load\(device_config\)*)
             conf_file="$2"
+            if [ -z "$conf_file" ]; then
+                continue
+            fi
             if [ ! -f  "$conf_file" ]; then
                 echo "WARNING: Unable to find file $conf_file" >&2
                 continue
@@ -312,7 +312,7 @@ macSDKify()
 getQMakeConf()
 {
     if [ -z "$specvals" ]; then
-        specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" "$HOST_VARS_FILE" | extractQMakeVariables`
+        specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables`
         if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi
     fi
     getSingleQMakeVariable "$1" "$specvals"
@@ -361,23 +361,6 @@ resolveDeviceMkspec()
     fi
 }
 
-#-------------------------------------------------------------------------------
-# Host options
-#-------------------------------------------------------------------------------
-HostVar()
-{
-    case "$1" in
-        set)
-            eq="="
-            ;;
-        *)
-            echo >&2 "BUG: wrong command to HostVar: $1"
-            ;;
-    esac
-
-    echo "$2" "$eq" "$3" >> "$HOST_VARS_FILE"
-}
-
 #-------------------------------------------------------------------------------
 # operating system detection
 #-------------------------------------------------------------------------------
@@ -559,7 +542,6 @@ while [ "$#" -gt 0 ]; do
     -xplatform| \
     -device| \
     -device-option| \
-    -host-option| \
     -sdk| \
     -android-sdk| \
     -android-ndk| \
@@ -697,11 +679,6 @@ while [ "$#" -gt 0 ]; do
         DEV_VAL=`echo $VAL | cut -d '=' -f 2-`
         DeviceVar set $DEV_VAR "$DEV_VAL"
         ;;
-    host-option)
-        HOST_VAR=`echo $VAL | cut -d '=' -f 1`
-        HOST_VAL=`echo $VAL | cut -d '=' -f 2-`
-        HostVar set $HOST_VAR "$HOST_VAL"
-        ;;
     optimized-qmake|optimized-tools)
         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
             CFG_RELEASE_TOOLS="$VAL"
@@ -1580,17 +1557,6 @@ else
     DEVICE_VARS_FILE="$DEVICE_VARS_OUTFILE"
 fi
 
-#-------------------------------------------------------------------------------
-# write out host config.
-#-------------------------------------------------------------------------------
-HOST_VARS_OUTFILE="$outpath/mkspecs/qhost.pri"
-if cmp -s "$HOST_VARS_FILE" "$HOST_VARS_OUTFILE"; then
-    rm -f "$HOST_VARS_FILE"
-else
-    mv -f $HOST_VARS_FILE "$HOST_VARS_OUTFILE"
-    HOST_VARS_FILE="$HOST_VARS_OUTFILE"
-fi
-
 #-------------------------------------------------------------------------------
 # run configure tests
 #-------------------------------------------------------------------------------

configure.json

@@ -81,7 +81,6 @@
             "gnumake": { "type": "boolean", "name": "GNUmake" },
             "gui": "boolean",
             "headersclean": "boolean",
-            "host-option": "string",
             "incredibuild-xge": { "type": "boolean", "name": "incredibuild_xge" },
             "libudev": "boolean",
             "ltcg": "boolean",

mkspecs/features/device_config.prf

@@ -1,12 +1,12 @@
 # This file is loaded by some qmakespecs to get early configuration data.
 
-host_build: \
-    PRI_FILE_NAME = qhost.pri
-else: \
-    PRI_FILE_NAME = qdevice.pri
-DEVICE_PRI = $$[QT_HOST_DATA/get]/mkspecs/$$PRI_FILE_NAME
+# Some of these qmakespecs can be used also in host mode, but they are not
+# supposed to be influenced by -device-option then.
+host_build: return()
+
+DEVICE_PRI = $$[QT_HOST_DATA/get]/mkspecs/qdevice.pri
 exists($$DEVICE_PRI):include($$DEVICE_PRI)
 unset(DEVICE_PRI)
 
 # this variable can be persisted via qmake -set CROSS_COMPILE /foo
-!host_build:isEmpty(CROSS_COMPILE): CROSS_COMPILE = $$[CROSS_COMPILE]
+isEmpty(CROSS_COMPILE): CROSS_COMPILE = $$[CROSS_COMPILE]

qtbase.pro

@@ -28,7 +28,6 @@ QMAKE_DISTCLEAN += \
     config.tests/.qmake.cache \
     mkspecs/qconfig.pri \
     mkspecs/qdevice.pri \
-    mkspecs/qhost.pri \
     mkspecs/qmodule.pri \
     src/corelib/global/qconfig.h \
     src/corelib/global/qconfig_p.h \
@@ -79,7 +78,7 @@ prefix_build|!equals(PWD, $$OUT_PWD) {
 mkspecs.path = $$[QT_HOST_DATA]/mkspecs
 mkspecs.files = \
     $$OUT_PWD/mkspecs/qconfig.pri $$OUT_PWD/mkspecs/qmodule.pri \
-    $$OUT_PWD/mkspecs/qdevice.pri $$OUT_PWD/mkspecs/qhost.pri \
+    $$OUT_PWD/mkspecs/qdevice.pri \
     $$files($$PWD/mkspecs/*)
 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
 INSTALLS += mkspecs