diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-03-22 12:40:00 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:39:58 +0200 |
commit | 8b822825c5066957622194acf0fc267a6bf473fd (patch) | |
tree | c4cca0c855dceae20389b4c789a7750b2ee30f39 /mkspecs/features/device_config.prf | |
parent | 6a8f64136e7c38fa4e94c916a57b83856ded3a8d (diff) |
make use of $$[FOO/get] properties
this cleans up a lot of hacks supporting the build of qt, including the
last bits of $QTDIR.
Change-Id: Id119886ed8097967dad6cf86ebd4e71d90c42841
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs/features/device_config.prf')
-rw-r--r-- | mkspecs/features/device_config.prf | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf index ccf13b5166..4377542cb7 100644 --- a/mkspecs/features/device_config.prf +++ b/mkspecs/features/device_config.prf @@ -1,35 +1,13 @@ # Load generated qdevice.pri -exists($$_QMAKE_CACHE_) { - # set in default_pre, so it's the first place to check for qdevice.pri - DIR = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE) - !isEmpty(DIR):DEVICE_PRI = $$DIR/mkspecs/qdevice.pri -} - -isEmpty(DEVICE_PRI) { - # OUTDIR environ is set by configure (arch detection) and compile.test - DIR = $$(OUTDIR) - !isEmpty(DIR):DEVICE_PRI = $$DIR/mkspecs/qdevice.pri -} - -isEmpty(DEVICE_PRI) { - DIR = $$[QT_HOST_DATA] - !isEmpty(DIR):DEVICE_PRI = $$DIR/mkspecs/qdevice.pri -} - -isEmpty(DEVICE_PRI) { - error(Could not locate qdevice.pri) -} - +DEVICE_PRI = $$[QMAKE_HOST_DATA/get]/mkspecs/qdevice.pri exists($$DEVICE_PRI):include($$DEVICE_PRI) +unset(DEVICE_PRI) isEmpty(CROSS_COMPILE) { #this variable can be persisted via qmake -set CROSS_COMPILE /foo CROSS_COMPILE = $$[CROSS_COMPILE] } -unset(DEVICE_PRI) -unset(DIR) - # Provide a function to be used by mkspecs defineTest(deviceSanityCheckCompiler) { # Check if the binary exists with an absolute path. Do this check |