summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/device_config.prf
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs/features/device_config.prf')
-rw-r--r--mkspecs/features/device_config.prf26
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