diff options
| author | David Schulz <david.schulz@theqtcompany.com> | 2015-10-12 09:55:30 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@theqtcompany.com> | 2015-10-30 13:14:51 +0000 |
| commit | c23a086e4fc9d7d7b2420de26cbc5adcbd23596e (patch) | |
| tree | 8251c0edd80825742a04d3292ecc9a175122b899 /mkspecs/features/device_config.prf | |
| parent | a2b58c1643b5c8b67cb18750ef2d565180a3a179 (diff) | |
configure: Separate host and build platform.
This separation makes it possible to make a
canadian cross build of Qt on a linux build machine.
The canadian cross build requires an external Qt that
runs on the build system.
Change-Id: Ifd83a4c6376d3299647e74bb349a3452a6f433fc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs/features/device_config.prf')
| -rw-r--r-- | mkspecs/features/device_config.prf | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf index e0383ef530..9281d3e407 100644 --- a/mkspecs/features/device_config.prf +++ b/mkspecs/features/device_config.prf @@ -1,16 +1,15 @@ # This file is loaded by some qmakespecs to get early configuration data. -# Load generated qdevice.pri -DEVICE_PRI = $$[QT_HOST_DATA/get]/mkspecs/qdevice.pri +host_build: \ + PRI_FILE_NAME = qhost.pri +else: \ + PRI_FILE_NAME = qdevice.pri +DEVICE_PRI = $$[QT_HOST_DATA/get]/mkspecs/$$PRI_FILE_NAME exists($$DEVICE_PRI):include($$DEVICE_PRI) unset(DEVICE_PRI) -host_build { - CROSS_COMPILE = -} else: isEmpty(CROSS_COMPILE) { - #this variable can be persisted via qmake -set CROSS_COMPILE /foo - CROSS_COMPILE = $$[CROSS_COMPILE] -} +# this variable can be persisted via qmake -set CROSS_COMPILE /foo +!host_build:isEmpty(CROSS_COMPILE): CROSS_COMPILE = $$[CROSS_COMPILE] # Provide a function to be used by mkspecs defineTest(deviceSanityCheckCompiler) { |