From d9643a016abc743db1dd879e7622cd27f88ff392 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 13 May 2019 11:04:42 +0200 Subject: Fix detection of the webengine-arm-thumb feature Configure tests must run in a clean environment. That's why functions that are defined below the mkspecs directory are discarded during the configure run. As a result, extractCFlag could not be found when running qtConftest_hasThumbFlag. This patch moves extractCFlag to src/core/config/functions.pri. Also, extractCFlag gets a qtwebengine_ prefix to avoid collisions with functions defined in other modules. The alias extractCFlag in functions.prf lets us use the old function within QtWebEngine itself. Fixes: QTBUG-75748 Change-Id: I6be613fbc569d5f7b3c145ef44b9a7be8e2ecb9d Reviewed-by: Kai Koehne --- mkspecs/features/functions.prf | 9 --------- 1 file changed, 9 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index f6aeea21a..9efa8958f 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -10,15 +10,6 @@ defineReplace(getChromiumSrcDir) { return($$git_chromium_src_dir) } -defineReplace(extractCFlag) { - CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS - OPTION = $$find(CFLAGS, $$1) - OPTION = $$split(OPTION, =) - PARAM = $$member(OPTION, 1) - !isEmpty(PARAM): return ($$PARAM) - return ($$OPTION) -} - defineReplace(which) { out = $$1 win32 { -- cgit v1.2.3