summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorPeter Kümmel <syntheticpp@gmx.net>2012-09-06 09:25:23 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-09-07 06:29:43 (GMT)
commit7d82bbb0d6b16356458eead0418e307ed92c79fa (patch)
treea00eb8dc61162207a57ab13c0c98d944cfe8a5d5 /mkspecs
parentb6d1a35d6cb464f643d7905ec731069e729d4ad4 (diff)
downloadQt-7d82bbb0d6b16356458eead0418e307ed92c79fa.zip
Qt-7d82bbb0d6b16356458eead0418e307ed92c79fa.tar.gz
Qt-7d82bbb0d6b16356458eead0418e307ed92c79fa.tar.bz2
Minimal backport of --device-option support in configure
This parial backport only adds the --device-option so it becomes possible to set and cache additional qmake variables. Partial cherry pick from qtbase/84e98fd9d2594637e928096c8fcb19d52e5e2676 Change-Id: I96636766aec7e12bfb1d377c8a607301a325a46c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/device_config.prf14
1 files changed, 14 insertions, 0 deletions
diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf
new file mode 100644
index 0000000..f7aeb07
--- /dev/null
+++ b/mkspecs/features/device_config.prf
@@ -0,0 +1,14 @@
+# Load generated qdevice.pri
+isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)
+isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = . # where to get?
+
+DEVICE_PRI = $$QT_BUILD_TREE/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]
+}
+