From 1253a02dc0a5dd206db349cf1d976a08152078e9 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 2 Mar 2020 18:06:46 +0100 Subject: CMake: Regenerate configure.cmake files to get reports Change-Id: Ifa1646c7e471b3eaba552498ee1dc24f6ab864de Reviewed-by: Joerg Bornemann --- configure.cmake | 146 ++++++++++++++++++++++++++++++++- src/corelib/configure.cmake | 49 +++++++++++ src/gui/configure.cmake | 146 +++++++++++++++++++++++++++++++++ src/network/configure.cmake | 40 +++++++++ src/plugins/sqldrivers/configure.cmake | 15 ++++ src/printsupport/configure.cmake | 3 + src/sql/configure.cmake | 3 + src/testlib/configure.cmake | 3 + src/widgets/configure.cmake | 8 ++ 9 files changed, 412 insertions(+), 1 deletion(-) diff --git a/configure.cmake b/configure.cmake index 5701bcef4b..c70d1892aa 100644 --- a/configure.cmake +++ b/configure.cmake @@ -728,7 +728,7 @@ qt_feature("libudev" PRIVATE qt_feature("qt_libinfix_plugins" LABEL "Use QT_LIBINFIX for Plugins" AUTODETECT OFF - ENABLE ( NOT INPUT_qt_libinfix STREQUAL '' AND INPUT_qt_libinfix_plugins STREQUAL 'yes' ) + ENABLE ( NOT INPUT_qt_libinfix STREQUAL '' ) AND INPUT_qt_libinfix_plugins STREQUAL 'yes' ) qt_feature_config("qt_libinfix_plugins" QMAKE_PRIVATE_CONFIG) qt_feature("compile_examples" @@ -746,6 +746,150 @@ qt_feature("relocatable" PRIVATE AUTODETECT QT_FEATURE_shared CONDITION QT_FEATURE_dlopen OR WIN32 OR NOT QT_FEATURE_shared ) +qt_configure_add_summary_build_type_and_config() +qt_configure_add_summary_section(NAME "Build options") +qt_configure_add_summary_build_mode(Mode) +qt_configure_add_summary_entry( + ARGS "optimize_debug" + CONDITION NOT MSVC AND NOT CLANG AND ( QT_FEATURE_debug OR QT_FEATURE_debug_and_release ) +) +qt_configure_add_summary_entry( + ARGS "optimize_size" + CONDITION NOT QT_FEATURE_debug OR QT_FEATURE_debug_and_release +) +qt_configure_add_summary_entry(ARGS "shared") +qt_configure_add_summary_entry( + TYPE "firstAvailableFeature" + ARGS "c++2a c++17 c++14 c++11" + MESSAGE "Using C++ standard" +) +qt_configure_add_summary_entry( + ARGS "ccache" + CONDITION UNIX +) +qt_configure_add_summary_entry( + ARGS "enable_new_dtags" + CONDITION LINUX +) +qt_configure_add_summary_entry( + ARGS "enable_gdb_index" + CONDITION GCC AND NOT CLANG AND ( QT_FEATURE_debug OR QT_FEATURE_force_debug_info OR QT_FEATURE_debug_and_release ) +) +qt_configure_add_summary_entry(ARGS "relocatable") +qt_configure_add_summary_entry(ARGS "precompile_header") +qt_configure_add_summary_entry(ARGS "ltcg") +qt_configure_add_summary_section(NAME "Target compiler supports") +qt_configure_add_summary_entry( + TYPE "featureList" + ARGS "sse2 sse3 ssse3 sse4_1 sse4_2" + MESSAGE "SSE" + CONDITION ( ( TEST_architecture_arch STREQUAL i386 ) OR ( TEST_architecture_arch STREQUAL x86_64 ) ) +) +qt_configure_add_summary_entry( + TYPE "featureList" + ARGS "avx avx2" + MESSAGE "AVX" + CONDITION ( ( TEST_architecture_arch STREQUAL i386 ) OR ( TEST_architecture_arch STREQUAL x86_64 ) ) +) +qt_configure_add_summary_entry( + TYPE "featureList" + ARGS "avx512f avx512er avx512cd avx512pf avx512dq avx512bw avx512vl avx512ifma avx512vbmi" + MESSAGE "AVX512" + CONDITION ( ( TEST_architecture_arch STREQUAL i386 ) OR ( TEST_architecture_arch STREQUAL x86_64 ) ) +) +qt_configure_add_summary_entry( + TYPE "featureList" + ARGS "aesni f16c rdrnd shani" + MESSAGE "Other x86" + CONDITION ( ( TEST_architecture_arch STREQUAL i386 ) OR ( TEST_architecture_arch STREQUAL x86_64 ) ) +) +qt_configure_add_summary_entry( + ARGS "x86SimdAlways" + CONDITION ( ( TEST_architecture_arch STREQUAL i386 ) OR ( TEST_architecture_arch STREQUAL x86_64 ) ) AND NOT MSVC +) +qt_configure_add_summary_entry( + ARGS "neon" + CONDITION ( TEST_architecture_arch STREQUAL arm ) OR ( TEST_architecture_arch STREQUAL arm64 ) +) +qt_configure_add_summary_entry( + ARGS "mips_dsp" + CONDITION ( TEST_architecture_arch STREQUAL mips ) +) +qt_configure_add_summary_entry( + ARGS "mips_dspr2" + CONDITION ( TEST_architecture_arch STREQUAL mips ) +) +qt_configure_end_summary_section() # end of "Target compiler supports" section +qt_configure_add_summary_section(NAME "Sanitizers") +qt_configure_add_summary_entry(ARGS "sanitize_address") +qt_configure_add_summary_entry(ARGS "sanitize_thread") +qt_configure_add_summary_entry(ARGS "sanitize_memory") +qt_configure_add_summary_entry(ARGS "sanitize_fuzzer_no_link") +qt_configure_add_summary_entry(ARGS "sanitize_undefined") +qt_configure_end_summary_section() # end of "Sanitizers" section +qt_configure_add_summary_entry( + TYPE "firstAvailableFeature" + ARGS "coverage_trace_pc_guard coverage_source_based" + MESSAGE "Code Coverage Instrumentation" + CONDITION QT_FEATURE_coverage +) +qt_configure_add_summary_entry( + ARGS "appstore-compliant" + CONDITION APPLE OR ANDROID OR WINRT OR WIN32 +) +qt_configure_end_summary_section() # end of "Build options" section +qt_configure_add_summary_section(NAME "Qt modules and options") +qt_configure_add_summary_entry(ARGS "concurrent") +qt_configure_add_summary_entry(ARGS "dbus") +qt_configure_add_summary_entry(ARGS "dbus-linked") +qt_configure_add_summary_entry(ARGS "gui") +qt_configure_add_summary_entry(ARGS "network") +qt_configure_add_summary_entry(ARGS "sql") +qt_configure_add_summary_entry(ARGS "testlib") +qt_configure_add_summary_entry(ARGS "widgets") +qt_configure_add_summary_entry(ARGS "xml") +qt_configure_end_summary_section() # end of "Qt modules and options" section +qt_configure_add_summary_section(NAME "Support enabled for") +qt_configure_add_summary_entry(ARGS "pkg-config") +qt_configure_add_summary_entry(ARGS "libudev") +qt_configure_add_summary_entry(ARGS "system-zlib") +qt_configure_add_summary_entry(ARGS "zstd") +qt_configure_end_summary_section() # end of "Support enabled for" section +qt_configure_add_report_entry( + TYPE NOTE + MESSAGE "Using static linking will disable the use of dynamically loaded plugins. Make sure to import all needed static plugins, or compile needed modules into the library." + CONDITION NOT QT_FEATURE_shared +) +qt_configure_add_report_entry( + TYPE NOTE + MESSAGE "Qt is using double for qreal on this system. This is binary-incompatible against Qt 5.1. Configure with '-qreal float' to create a build that is binary-compatible with 5.1." + CONDITION INPUT_qreal STREQUAL 'double' AND ( TEST_architecture_arch STREQUAL arm ) +) +qt_configure_add_report_entry( + TYPE ERROR + MESSAGE "Debug build wihtout Release build is not currently supported on ios see QTBUG-71990. Use -debug-and-release." + CONDITION APPLE_IOS AND QT_FEATURE_debug AND NOT QT_FEATURE_debug_and_release +) +qt_configure_add_report_entry( + TYPE WARNING + MESSAGE "-debug-and-release is only supported on Darwin and Windows platforms. Qt can be built in release mode with separate debug information, so -debug-and-release is no longer necessary." + CONDITION INPUT_debug_and_release STREQUAL 'yes' AND NOT APPLE AND NOT WIN32 +) +qt_configure_add_report_entry( + TYPE ERROR + MESSAGE "debug-only framework builds are not supported. Configure with -no-framework if you want a pure debug build." + CONDITION QT_FEATURE_framework AND QT_FEATURE_debug AND NOT QT_FEATURE_debug_and_release +) +qt_configure_add_report_entry( + TYPE ERROR + MESSAGE "Command line option -coverage is only supported with clang compilers." + CONDITION QT_FEATURE_coverage AND NOT CLANG +) +qt_configure_add_report_entry( + TYPE ERROR + MESSAGE "Command line option -sanitize fuzzer-no-link is only supported with clang compilers." + CONDITION QT_FEATURE_sanitize_fuzzer_no_link AND NOT CLANG +) qt_extra_definition("QT_VERSION_STR" "\"${PROJECT_VERSION}\"" PUBLIC) qt_extra_definition("QT_VERSION_MAJOR" ${PROJECT_VERSION_MAJOR} PUBLIC) diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index d2b310b58d..556622aa79 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -980,3 +980,52 @@ qt_feature("binaryjson" PUBLIC LABEL "Binary JSON (deprecated)" PURPOSE "Provides support for the deprecated binary JSON format." ) +qt_configure_add_summary_section(NAME "Qt Core") +qt_configure_add_summary_entry(ARGS "doubleconversion") +qt_configure_add_summary_entry(ARGS "system-doubleconversion") +qt_configure_add_summary_entry(ARGS "glib") +qt_configure_add_summary_entry(ARGS "iconv") +qt_configure_add_summary_entry(ARGS "icu") +qt_configure_add_summary_entry(ARGS "mimetype-database") +qt_configure_add_summary_entry( + TYPE "firstAvailableFeature" + ARGS "etw lttng" + MESSAGE "Tracing backend" +) +qt_configure_add_summary_section(NAME "Logging backends") +qt_configure_add_summary_entry(ARGS "journald") +qt_configure_add_summary_entry(ARGS "syslog") +qt_configure_add_summary_entry(ARGS "slog2") +qt_configure_end_summary_section() # end of "Logging backends" section +qt_configure_add_summary_entry( + ARGS "qqnx_pps" + CONDITION QNX +) +qt_configure_add_summary_entry(ARGS "pcre2") +qt_configure_add_summary_entry(ARGS "system-pcre2") +qt_configure_end_summary_section() # end of "Qt Core" section +qt_configure_add_report_entry( + TYPE NOTE + MESSAGE "journald, syslog or slog2 integration is enabled. If your users intend to develop applications against this build, ensure that the IDEs they use either set QT_FORCE_STDERR_LOGGING to 1 or are able to read the logged output from journald, syslog or slog2." + CONDITION QT_FEATURE_journald OR QT_FEATURE_syslog OR ( QNX AND QT_FEATURE_slog2 ) +) +qt_configure_add_report_entry( + TYPE ERROR + MESSAGE "C++11 is required and is missing or failed to compile." + CONDITION NOT TEST_cxx11_random +) +qt_configure_add_report_entry( + TYPE ERROR + MESSAGE "Your C library does not provide sscanf_l or snprintf_l. You need to use libdouble-conversion for double/string conversion." + CONDITION INPUT_doubleconversion STREQUAL 'no' AND NOT TEST_xlocalescanprint +) +qt_configure_add_report_entry( + TYPE ERROR + MESSAGE "detected a std::atomic implementation that fails for function pointers. Please apply the patch corresponding to your Standard Library vendor, found in qtbase/config.tests/atomicfptr" + CONDITION NOT TEST_atomicfptr +) +qt_configure_add_report_entry( + TYPE ERROR + MESSAGE "Qt requires poll(), ppoll(), poll_ts() or select() on this platform" + CONDITION ( UNIX OR INTEGRITY ) AND ( NOT QT_FEATURE_poll_ppoll ) AND ( NOT QT_FEATURE_poll_pollts ) AND ( NOT QT_FEATURE_poll_poll ) AND ( NOT QT_FEATURE_poll_select ) +) diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index c7a11e2b1e..07866eff9e 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -1141,3 +1141,149 @@ qt_feature("raster-64bit" PRIVATE LABEL "QPainter - 64 bit raster" PURPOSE "Internal painting support for 64 bit (16 bpc) rasterization." ) +qt_configure_add_summary_section(NAME "Qt Gui") +qt_configure_add_summary_entry(ARGS "accessibility") +qt_configure_add_summary_entry(ARGS "freetype") +qt_configure_add_summary_entry(ARGS "system-freetype") +qt_configure_add_summary_entry(ARGS "harfbuzz") +qt_configure_add_summary_entry(ARGS "system-harfbuzz") +qt_configure_add_summary_entry(ARGS "fontconfig") +qt_configure_add_summary_section(NAME "Image formats") +qt_configure_add_summary_entry(ARGS "gif") +qt_configure_add_summary_entry(ARGS "ico") +qt_configure_add_summary_entry(ARGS "jpeg") +qt_configure_add_summary_entry(ARGS "system-jpeg") +qt_configure_add_summary_entry(ARGS "png") +qt_configure_add_summary_entry(ARGS "system-png") +qt_configure_end_summary_section() # end of "Image formats" section +qt_configure_add_summary_section(NAME "Text formats") +qt_configure_add_summary_entry(ARGS "texthtmlparser") +qt_configure_add_summary_entry(ARGS "cssparser") +qt_configure_add_summary_entry(ARGS "textodfwriter") +qt_configure_add_summary_entry(ARGS "textmarkdownreader") +qt_configure_add_summary_entry(ARGS "system-textmarkdownreader") +qt_configure_add_summary_entry(ARGS "textmarkdownwriter") +qt_configure_end_summary_section() # end of "Text formats" section +qt_configure_add_summary_entry(ARGS "egl") +qt_configure_add_summary_entry(ARGS "openvg") +qt_configure_add_summary_section(NAME "OpenGL") +qt_configure_add_summary_entry( + ARGS "angle" + CONDITION WIN32 +) +qt_configure_add_summary_entry( + ARGS "combined-angle-lib" + CONDITION QT_FEATURE_angle +) +qt_configure_add_summary_entry(ARGS "opengl-desktop") +qt_configure_add_summary_entry( + ARGS "opengl-dynamic" + CONDITION WIN32 +) +qt_configure_add_summary_entry(ARGS "opengles2") +qt_configure_add_summary_entry(ARGS "opengles3") +qt_configure_add_summary_entry(ARGS "opengles31") +qt_configure_add_summary_entry(ARGS "opengles32") +qt_configure_end_summary_section() # end of "OpenGL" section +qt_configure_add_summary_entry(ARGS "vulkan") +qt_configure_add_summary_entry(ARGS "sessionmanager") +qt_configure_end_summary_section() # end of "Qt Gui" section +qt_configure_add_summary_section(NAME "Features used by QPA backends") +qt_configure_add_summary_entry(ARGS "evdev") +qt_configure_add_summary_entry(ARGS "libinput") +qt_configure_add_summary_entry(ARGS "integrityhid") +qt_configure_add_summary_entry(ARGS "mtdev") +qt_configure_add_summary_entry(ARGS "tslib") +qt_configure_add_summary_entry(ARGS "xkbcommon") +qt_configure_add_summary_section(NAME "X11 specific") +qt_configure_add_summary_entry(ARGS "xlib") +qt_configure_add_summary_entry(ARGS "xcb-xlib") +qt_configure_add_summary_entry(ARGS "egl_x11") +qt_configure_add_summary_entry(ARGS "xkbcommon-x11") +qt_configure_end_summary_section() # end of "X11 specific" section +qt_configure_end_summary_section() # end of "Features used by QPA backends" section +qt_configure_add_summary_section(NAME "QPA backends") +qt_configure_add_summary_entry(ARGS "directfb") +qt_configure_add_summary_entry(ARGS "eglfs") +qt_configure_add_summary_section(NAME "EGLFS details") +qt_configure_add_summary_entry(ARGS "eglfs_openwfd") +qt_configure_add_summary_entry(ARGS "eglfs_viv") +qt_configure_add_summary_entry(ARGS "eglfs_viv_wl") +qt_configure_add_summary_entry(ARGS "eglfs_rcar") +qt_configure_add_summary_entry(ARGS "eglfs_egldevice") +qt_configure_add_summary_entry(ARGS "eglfs_gbm") +qt_configure_add_summary_entry(ARGS "eglfs_vsp2") +qt_configure_add_summary_entry(ARGS "eglfs_mali") +qt_configure_add_summary_entry(ARGS "eglfs_brcm") +qt_configure_add_summary_entry(ARGS "eglfs_x11") +qt_configure_end_summary_section() # end of "EGLFS details" section +qt_configure_add_summary_entry(ARGS "linuxfb") +qt_configure_add_summary_entry(ARGS "vnc") +qt_configure_add_summary_entry( + ARGS "integrityfb" + CONDITION INTEGRITY +) +qt_configure_add_summary_section(NAME "QNX") +qt_configure_add_summary_entry(ARGS "lgmon") +qt_configure_add_summary_entry(ARGS "qqnx_imf") +qt_configure_end_summary_section() # end of "QNX" section +qt_configure_add_summary_section(NAME "XCB") +qt_configure_add_summary_entry(ARGS "system-xcb-xinput") +qt_configure_add_summary_entry(ARGS "xcb-native-painting") +qt_configure_add_summary_section(NAME "GL integrations") +qt_configure_add_summary_entry(ARGS "xcb-glx-plugin") +qt_configure_add_summary_entry(ARGS "xcb-glx") +qt_configure_add_summary_entry(ARGS "xcb-egl-plugin") +qt_configure_end_summary_section() # end of "GL integrations" section +qt_configure_end_summary_section() # end of "XCB" section +qt_configure_add_summary_section(NAME "Windows") +qt_configure_add_summary_entry(ARGS "direct2d") +qt_configure_add_summary_entry(ARGS "directwrite") +qt_configure_add_summary_entry(ARGS "directwrite2") +qt_configure_end_summary_section() # end of "Windows" section +qt_configure_end_summary_section() # end of "QPA backends" section +qt_configure_add_report_entry( + TYPE NOTE + MESSAGE "XCB support on macOS is minimal and untested. Some features will not work properly or at all (e.g. OpenGL, desktop services or accessibility), or may depend on your system and XQuartz setup." + CONDITION QT_FEATURE_xcb AND APPLE +) +qt_configure_add_report_entry( + TYPE NOTE + MESSAGE "Disabling X11 Accessibility Bridge: D-Bus or AT-SPI is missing." + CONDITION QT_FEATURE_accessibility AND QT_FEATURE_xcb AND NOT QT_FEATURE_accessibility_atspi_bridge +) +qt_configure_add_report_entry( + TYPE WARNING + MESSAGE "The [-no]-qpa-platform-guard argument is deprecated and has no effect." + CONDITION ( NOT INPUT_qpa_platform_guard STREQUAL '' ) +) +qt_configure_add_report_entry( + TYPE WARNING + MESSAGE "No QPA platform plugin enabled! This will produce a Qt that cannot run GUI applications. See \"Platform backends\" in the output of --help." + CONDITION QT_FEATURE_gui AND LINUX AND NOT ANDROID AND NOT QT_FEATURE_xcb AND NOT QT_FEATURE_eglfs AND NOT QT_FEATURE_directfb AND NOT QT_FEATURE_linuxfb +) +qt_configure_add_report_entry( + TYPE WARNING + MESSAGE "Using OpenGL ES 2.0 on Windows without ANGLE. The build will most likely fail. Specify -opengl desktop to use regular OpenGL." + CONDITION WIN32 AND ( QT_FEATURE_opengles2 OR QT_FEATURE_opengl_dynamic ) AND NOT QT_FEATURE_angle +) +qt_configure_add_report_entry( + TYPE WARNING + MESSAGE "On OS X, AAT is supported only with -qt-harfbuzz." + CONDITION APPLE AND QT_FEATURE_system_harfbuzz +) +qt_configure_add_report_entry( + TYPE ERROR + MESSAGE "The OpenGL functionality tests failed! You might need to modify the include and library search paths by editing QMAKE_INCDIR_OPENGL[_ES2], QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your platform." + CONDITION QT_FEATURE_gui AND NOT APPLE_WATCHOS AND ( NOT INPUT_opengl STREQUAL 'no' ) AND NOT QT_FEATURE_opengl_desktop AND NOT QT_FEATURE_opengles2 AND NOT QT_FEATURE_opengl_dynamic +) +qt_configure_add_report_entry( + TYPE WARNING + MESSAGE "Accessibility disabled. This configuration of Qt is unsupported." + CONDITION NOT QT_FEATURE_accessibility +) +qt_configure_add_report_entry( + TYPE ERROR + MESSAGE "XCB plugin requires xkbcommon and xkbcommon-x11, but -no-xkbcommon was provided." + CONDITION ( NOT INPUT_xcb STREQUAL '' ) AND ( NOT INPUT_xcb STREQUAL 'no' ) AND INPUT_xkbcommon STREQUAL 'no' +) diff --git a/src/network/configure.cmake b/src/network/configure.cmake index a99323823f..086acc5e72 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -411,3 +411,43 @@ qt_feature("topleveldomain" PUBLIC LABEL "qTopLevelDomain()" PURPOSE "Provides support for extracting the top level domain from URLs. If enabled, a binary dump of the Public Suffix List (http://www.publicsuffix.org, Mozilla License) is included. The data is then also used in QNetworkCookieJar::validateCookie." ) +qt_configure_add_summary_section(NAME "Qt Network") +qt_configure_add_summary_entry( + ARGS "corewlan" + CONDITION APPLE +) +qt_configure_add_summary_entry(ARGS "getifaddrs") +qt_configure_add_summary_entry(ARGS "ipv6ifname") +qt_configure_add_summary_entry(ARGS "libproxy") +qt_configure_add_summary_entry( + ARGS "linux-netlink" + CONDITION LINUX +) +qt_configure_add_summary_entry( + ARGS "securetransport" + CONDITION APPLE +) +qt_configure_add_summary_entry( + ARGS "schannel" + CONDITION WIN32 AND NOT WINRT +) +qt_configure_add_summary_entry(ARGS "openssl") +qt_configure_add_summary_entry(ARGS "openssl-linked") +qt_configure_add_summary_entry(ARGS "opensslv11") +qt_configure_add_summary_entry(ARGS "dtls") +qt_configure_add_summary_entry(ARGS "ocsp") +qt_configure_add_summary_entry(ARGS "ftp") +qt_configure_add_summary_entry(ARGS "sctp") +qt_configure_add_summary_entry(ARGS "system-proxies") +qt_configure_add_summary_entry(ARGS "gssapi") +qt_configure_end_summary_section() # end of "Qt Network" section +qt_configure_add_report_entry( + TYPE NOTE + MESSAGE "When linking against OpenSSL, you can override the default library names through OPENSSL_LIBS. For example: OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked" + CONDITION NOT ANDROID AND QT_FEATURE_openssl_linked AND OpenSSL_FOUND.source NOT = 0 AND INPUT_openssl.prefix STREQUAL '' AND INPUT_openssl.libs STREQUAL '' AND INPUT_openssl.libs.debug STREQUAL '' OR FIXME +) +qt_configure_add_report_entry( + TYPE WARNING + MESSAGE "Some of libproxy's plugins may use incompatible Qt versions. Some platforms and distributions ship libproxy with plugins, such as config_kde4.so, that are linked against old versions of Qt, and libproxy loads these plugins automatically when initialized. If Qt is not in a namespace, that loading causes a crash. Even if the systems on which you build and test have no such plugins, your users' systems may have them. We therefore recommend that you combine -libproxy with -qtnamespace when configuring Qt." + CONDITION QT_FEATURE_libproxy AND INPUT_qt_namespace STREQUAL '' +) diff --git a/src/plugins/sqldrivers/configure.cmake b/src/plugins/sqldrivers/configure.cmake index 7cf0763da1..1237c3fb5a 100644 --- a/src/plugins/sqldrivers/configure.cmake +++ b/src/plugins/sqldrivers/configure.cmake @@ -48,3 +48,18 @@ qt_feature("sql-sqlite" PRIVATE LABEL "SQLite" CONDITION QT_FEATURE_datestring AND SQLite3_FOUND ) +qt_configure_add_summary_section(NAME "Qt Sql Drivers") +qt_configure_add_summary_entry(ARGS "sql-db2") +qt_configure_add_summary_entry(ARGS "sql-ibase") +qt_configure_add_summary_entry(ARGS "sql-mysql") +qt_configure_add_summary_entry(ARGS "sql-oci") +qt_configure_add_summary_entry(ARGS "sql-odbc") +qt_configure_add_summary_entry(ARGS "sql-psql") +qt_configure_add_summary_entry(ARGS "sql-sqlite") +qt_configure_add_summary_entry(ARGS "system-sqlite") +qt_configure_end_summary_section() # end of "Qt Sql Drivers" section +qt_configure_add_report_entry( + TYPE WARNING + MESSAGE "Qt does not support compiling the Oracle database driver with MinGW, due to lack of such support from Oracle. Consider disabling the Oracle driver, as the current build will most likely fail." + CONDITION WIN32 AND NOT MSVC AND QT_FEATURE_sql_oci +) diff --git a/src/printsupport/configure.cmake b/src/printsupport/configure.cmake index c9b5f74750..145a4b05d7 100644 --- a/src/printsupport/configure.cmake +++ b/src/printsupport/configure.cmake @@ -56,3 +56,6 @@ qt_feature("printpreviewdialog" PUBLIC CONDITION QT_FEATURE_printpreviewwidget AND QT_FEATURE_printdialog AND QT_FEATURE_toolbar AND QT_FEATURE_formlayout ) qt_feature_definition("printpreviewdialog" "QT_NO_PRINTPREVIEWDIALOG" NEGATE VALUE "1") +qt_configure_add_summary_section(NAME "Qt PrintSupport") +qt_configure_add_summary_entry(ARGS "cups") +qt_configure_end_summary_section() # end of "Qt PrintSupport" section diff --git a/src/sql/configure.cmake b/src/sql/configure.cmake index 545b542d6b..552b6846c7 100644 --- a/src/sql/configure.cmake +++ b/src/sql/configure.cmake @@ -19,3 +19,6 @@ qt_feature("sqlmodel" PUBLIC PURPOSE "Provides item model classes backed by SQL databases." CONDITION QT_FEATURE_itemmodel ) +qt_configure_add_summary_section(NAME "Qt Sql") +qt_configure_add_summary_entry(ARGS "sqlmodel") +qt_configure_end_summary_section() # end of "Qt Sql" section diff --git a/src/testlib/configure.cmake b/src/testlib/configure.cmake index b02487223c..d83b4f09b0 100644 --- a/src/testlib/configure.cmake +++ b/src/testlib/configure.cmake @@ -29,3 +29,6 @@ qt_feature("valgrind" PUBLIC PURPOSE "Profiling support with callgrind." CONDITION ( LINUX OR APPLE ) AND QT_FEATURE_process AND QT_FEATURE_regularexpression ) +qt_configure_add_summary_section(NAME "Qt Testlib") +qt_configure_add_summary_entry(ARGS "itemmodeltester") +qt_configure_end_summary_section() # end of "Qt Testlib" section diff --git a/src/widgets/configure.cmake b/src/widgets/configure.cmake index 25af8aea8a..88b1f3e650 100644 --- a/src/widgets/configure.cmake +++ b/src/widgets/configure.cmake @@ -561,3 +561,11 @@ qt_feature("undoview" PUBLIC CONDITION QT_FEATURE_undostack AND QT_FEATURE_listview ) qt_feature_definition("undoview" "QT_NO_UNDOVIEW" NEGATE VALUE "1") +qt_configure_add_summary_section(NAME "Qt Widgets") +qt_configure_add_summary_entry(ARGS "gtk3") +qt_configure_add_summary_entry( + TYPE "featureList" + ARGS "style-fusion style-mac style-windows style-windowsvista style-android" + MESSAGE "Styles" +) +qt_configure_end_summary_section() # end of "Qt Widgets" section -- cgit v1.2.3