diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-24 17:36:38 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-13 18:55:59 +0000 |
| commit | 42196f4061263d6d0e453c0561f7604cadc6d0a3 (patch) | |
| tree | 45c141b2760cecb25abf9b8d3c7a4a3187b317ee /mkspecs | |
| parent | e58eb3d6f953c224c2d47cd344bc41ba9f499223 (diff) | |
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 <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/device_config.prf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf index 5c5b094a9c..c15559e174 100644 --- a/mkspecs/features/device_config.prf +++ b/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] |