diff options
| author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-31 23:39:10 +0000 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-31 23:39:10 +0000 |
| commit | aa84de1afa78cf4b63239b35a4b65f1c9c4eab6c (patch) | |
| tree | 259e608cdb446c6d4f207528ea656a25fef644d8 /src/corelib | |
| parent | 007addc0cc3fb5d5e06fa8490f5247e064d6f8b0 (diff) | |
| parent | 8f2795b17fde2a595fbb67f4531c3d49b8b3d2cd (diff) | |
Merge integration refs/builds/qtci/dev/1617226155
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/.prev_configure.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/.prev_configure.cmake b/src/corelib/.prev_configure.cmake index 9052acf87b..893acda953 100644 --- a/src/corelib/.prev_configure.cmake +++ b/src/corelib/.prev_configure.cmake @@ -14,6 +14,9 @@ set_property(CACHE INPUT_libb2 PROPERTY STRINGS undefined no qt system) #### Libraries +if((UNIX) OR QT_FIND_ALL_PACKAGES_ALWAYS) + qt_find_package(WrapBacktrace PROVIDED_TARGETS WrapBacktrace::WrapBacktrace MODULE_NAME core QMAKE_LIB backtrace) +endif() qt_find_package(WrapDoubleConversion PROVIDED_TARGETS WrapDoubleConversion::WrapDoubleConversion MODULE_NAME core QMAKE_LIB doubleconversion) qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE_NAME core QMAKE_LIB glib) qt_find_package(ICU COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data MODULE_NAME core QMAKE_LIB icu) @@ -668,6 +671,10 @@ qt_feature("regularexpression" PUBLIC CONDITION QT_FEATURE_system_pcre2 OR QT_FEATURE_pcre2 ) qt_feature_definition("regularexpression" "QT_NO_REGULAREXPRESSION" NEGATE VALUE "1") +qt_feature("backtrace" PRIVATE + LABEL "backtrace" + CONDITION UNIX AND QT_FEATURE_regularexpression AND WrapBacktrace_FOUND +) qt_feature("sharedmemory" PUBLIC SECTION "Kernel" LABEL "QSharedMemory" @@ -903,6 +910,7 @@ qt_feature("cborstreamwriter" PUBLIC PURPOSE "Provides support for writing the CBOR binary format." ) qt_configure_add_summary_section(NAME "Qt Core") +qt_configure_add_summary_entry(ARGS "backtrace") qt_configure_add_summary_entry(ARGS "doubleconversion") qt_configure_add_summary_entry(ARGS "system-doubleconversion") qt_configure_add_summary_entry(ARGS "glib") |