summaryrefslogtreecommitdiffstats
path: root/tools/qmake
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-02-04 17:12:25 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-05 15:51:30 +0100
commit5a304a9adb834afc946c949cf8538a4f8b5d7cdd (patch)
treed97b5d3e34d926c9d05c57d310dd41e3dfd4a754 /tools/qmake
parentecaab295f96e3d12fc952c49d35a6eb32f72aba1 (diff)
Fix the embedded build
Adopt to toolchain changes and fix the build with the current snapshot. This patch adds some missing overrides and build system configurations. Change-Id: I488929500347bdb5a077ac14e9553cedfcaa605d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'tools/qmake')
-rw-r--r--tools/qmake/mkspecs/features/functions.prf4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index d4fdf6393..46d43be96 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -19,7 +19,9 @@ defineReplace(getConfigDir) {
}
defineReplace(extractCFlag) {
- OPTION = $$find(QMAKE_CFLAGS, $$1)
+ CFLAGS = $$QMAKE_CFLAGS
+ !isEmpty(ANDROID_TARGET_CFLAGS): CFLAGS = $$ANDROID_TARGET_CFLAGS
+ OPTION = $$find(CFLAGS, $$1)
OPTION = $$split(OPTION, =)
return ($$member(OPTION, 1))
}