diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-23 10:36:26 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 10:42:53 +0200 |
| commit | b7a905a4f2f43b856e5f365439fb21b70a03682e (patch) | |
| tree | 0712f43bbeec8c03e739110ddfa584943bf6fdac /configure.pri | |
| parent | e710d15b7243f2fbc99f98c3ca79d325eb459ac7 (diff) | |
| parent | e02bcb0855ebee0612cab0f3cd3f9fd494497336 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/3rdparty
src/core/net/network_delegate_qt.cpp
tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
Change-Id: Ib715b3047213583e0441b915d3cabb801d9d4ba8
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 8db31ddd3..d03d3c8e0 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,) |