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 /configure.pri | |
| 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 'configure.pri')
| -rw-r--r-- | configure.pri | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.pri b/configure.pri index 26c57ce61..897bea540 100644 --- a/configure.pri +++ b/configure.pri @@ -1,3 +1,5 @@ +include(src/core/config/functions.pri) + # this must be done outside any function QTWEBENGINE_SOURCE_TREE = $$PWD @@ -297,12 +299,12 @@ defineTest(qtConfTest_isWindowsHostCompiler64) { # Fixme QTBUG-71772 defineTest(qtConfTest_hasThumbFlag) { - FLAG = $$extractCFlag("-mthumb") + FLAG = $$qtwebengine_extractCFlag("-mthumb") !isEmpty(FLAG): return(true) - FLAG = $$extractCFlag("-marm") + FLAG = $$qtwebengine_extractCFlag("-marm") !isEmpty(FLAG): return(false) - MARCH = $$extractCFlag("-march=.*") + MARCH = $$qtwebengine_extractCFlag("-march=.*") MARMV = $$replace(MARCH, "armv",) !isEmpty(MARMV) { MARMV = $$split(MARMV,) |