From 5a304a9adb834afc946c949cf8538a4f8b5d7cdd Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Tue, 4 Feb 2014 17:12:25 +0100 Subject: 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 --- tools/qmake/mkspecs/features/functions.prf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools/qmake') 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)) } -- cgit v1.2.3