diff options
| author | Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> | 2022-03-23 08:51:42 +0000 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-04-07 10:00:17 +0000 |
| commit | 288f60442fefa717dfc3c7587f1d480910b50874 (patch) | |
| tree | 2cfafa2d66bdfcbbe35dccd1db8679de7ad7e18e /configure.cmake | |
| parent | 8018a4cbce8f01add2aa011b3448516cb6ea92ef (diff) | |
| download | qtwebengine-288f60442fefa717dfc3c7587f1d480910b50874.tar.gz | |
Fix build with libc++
Fix build with libc++ on linux by adding missing use_libcxx
parameter.
Check if re2 and poppler can be used as they use std::string in
their api. Add compiler test to check that.
Pick-to: 6.3 6.2
Change-Id: I74bf79b8443ad470621c1a2e0c9dc768d4cca1f1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index 7d92341f8..106fe86d9 100644 --- a/configure.cmake +++ b/configure.cmake @@ -71,11 +71,14 @@ qt_config_compile_test(re2 CODE " #include \"re2/filtered_re2.h\" +#include <vector> int main() { std::string s; re2::FilteredRE2 fre2(1); int id = 0; fre2.Add(s, {}, &id); + std::vector<std::string> pattern = {\"match\"}; + fre2.Compile(&pattern); const RE2 &re2 = fre2.GetRE2(id); }" ) @@ -269,7 +272,7 @@ qt_feature("webengine-developer-build" PRIVATE ) qt_feature("webengine-system-re2" PRIVATE LABEL "re2" - AUTODETECT UNIX AND TEST_re2 + CONDITION UNIX AND TEST_re2 ) qt_feature("webengine-system-icu" PRIVATE LABEL "icu" |