diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-02-04 17:12:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-05 15:51:30 +0100 |
| commit | 5a304a9adb834afc946c949cf8538a4f8b5d7cdd (patch) | |
| tree | d97b5d3e34d926c9d05c57d310dd41e3dfd4a754 /tools/qmake/mkspecs | |
| parent | ecaab295f96e3d12fc952c49d35a6eb32f72aba1 (diff) | |
Diffstat (limited to 'tools/qmake/mkspecs')
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 4 |
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)) } |