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 /src/core | |
| parent | 8018a4cbce8f01add2aa011b3448516cb6ea92ef (diff) | |
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 'src/core')
| -rw-r--r-- | src/core/api/configure.cmake | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake index 9da8324e8..b13d72555 100644 --- a/src/core/api/configure.cmake +++ b/src/core/api/configure.cmake @@ -8,6 +8,7 @@ if(NOT QT_CONFIGURE_RUNNING) pkg_check_modules(ALSA alsa IMPORTED_TARGET) pkg_check_modules(PULSEAUDIO libpulse>=0.9.10 libpulse-mainloop-glib) pkg_check_modules(XDAMAGE xdamage) + pkg_check_modules(POPPLER_CPP poppler-cpp IMPORTED_TARGET) if(NOT GIO_FOUND) pkg_check_modules(GIO gio-2.0) endif() @@ -19,6 +20,19 @@ endif() #### Tests +qt_config_compile_test(poppler + LABEL "poppler" + LIBRARIES + PkgConfig::POPPLER_CPP + CODE +" +#include <poppler-document.h> + +int main() { + auto *pdf = poppler::document::load_from_raw_data(\"file\",100,std::string(\"user\")); +}" +) + qt_config_compile_test(alsa LABEL "alsa" LIBRARIES @@ -131,6 +145,11 @@ qt_feature("webengine-sanitizer" PRIVATE AUTODETECT CLANG CONDITION CLANG AND ECM_ENABLE_SANITIZERS ) +# internal testing feature +qt_feature("webengine-system-poppler" PRIVATE + LABEL "popler" + CONDITION UNIX AND TEST_poppler +) qt_configure_add_summary_section(NAME "Qt WebEngineCore") qt_configure_add_summary_entry(ARGS "webengine-embedded-build") qt_configure_add_summary_entry(ARGS "webengine-full-debug-info") |