diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-05-13 11:04:42 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-05-21 08:35:26 +0200 |
| commit | d9643a016abc743db1dd879e7622cd27f88ff392 (patch) | |
| tree | 935388fd6d1ea2cf53bcff7867d1cb1bb73c841a /mkspecs | |
| parent | 1a8e93c95de92f6a00bdf3768c5315dd032513c0 (diff) | |
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 <kai.koehne@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/functions.prf | 9 |
1 files changed, 0 insertions, 9 deletions
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 { |