diff options
| -rw-r--r-- | configure.cmake | 123 | ||||
| -rw-r--r-- | src/corelib/configure.cmake | 29 | ||||
| -rw-r--r-- | src/gui/configure.cmake | 47 | ||||
| -rw-r--r-- | src/network/configure.cmake | 11 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/configure.cmake | 18 | ||||
| -rw-r--r-- | src/widgets/configure.cmake | 14 |
6 files changed, 183 insertions, 59 deletions
diff --git a/configure.cmake b/configure.cmake index 4118f57f22..b2bdfd620a 100644 --- a/configure.cmake +++ b/configure.cmake @@ -309,15 +309,31 @@ int main(int argc, char **argv) #### Features # This belongs into gui, but the license check needs it here already. -qt_feature("android_style_assets" PRIVATE +qt_feature("android-style-assets" PRIVATE LABEL "Android Style Assets" CONDITION ANDROID ) +qt_feature("use_bfd_linker" + LABEL "bfd" + AUTODETECT false + CONDITION NOT WIN32 AND NOT INTEGRITY AND NOT WASM AND tests.use_bfd_linker OR FIXME + ENABLE INPUT_linker STREQUAL 'bfd' + DISABLE INPUT_linker STREQUAL 'gold' OR INPUT_linker STREQUAL 'lld' +) +qt_feature_config("use_bfd_linker" QMAKE_PRIVATE_CONFIG) qt_feature("use_gold_linker_alias" AUTODETECT false CONDITION NOT WIN32 AND NOT INTEGRITY AND NOT WASM AND tests.use_gold_linker OR FIXME ) -qt_feature("developer_build" +qt_feature("use_lld_linker" + LABEL "lld" + AUTODETECT false + CONDITION NOT WIN32 AND NOT INTEGRITY AND NOT WASM AND tests.use_lld_linker OR FIXME + ENABLE INPUT_linker STREQUAL 'lld' + DISABLE INPUT_linker STREQUAL 'bfd' OR INPUT_linker STREQUAL 'gold' +) +qt_feature_config("use_lld_linker" QMAKE_PRIVATE_CONFIG) +qt_feature("developer-build" LABEL "Developer build" AUTODETECT OFF ) @@ -325,8 +341,11 @@ qt_feature("private_tests" PRIVATE LABEL "Developer build: private_tests" CONDITION QT_FEATURE_developer_build ) -qt_feature_definition("developer_build" "QT_BUILD_INTERNAL") -qt_feature("appstore_compliant" PUBLIC +qt_feature_definition("developer-build" "QT_BUILD_INTERNAL") +qt_feature_config("developer-build" QMAKE_PUBLIC_QT_CONFIG + NAME "private_tests" +) +qt_feature("appstore-compliant" PUBLIC LABEL "App store compliance" PURPOSE "Disables code that is not allowed in platform app stores" AUTODETECT APPLE_UIKIT OR ANDROID OR WINRT @@ -335,45 +354,89 @@ qt_feature("simulator_and_device" PUBLIC LABEL "Build for both simulator and device" CONDITION APPLE_UIKIT AND NOT QT_UIKIT_SDK ) +qt_feature_config("simulator_and_device" QMAKE_PUBLIC_QT_CONFIG) qt_feature("force_asserts" PUBLIC LABEL "Force assertions" AUTODETECT OFF ) +qt_feature("headersclean" + LABEL "Check for clean headers" + AUTODETECT QT_FEATURE_developer_build + CONDITION NOT WASM +) +qt_feature_config("headersclean" QMAKE_PRIVATE_CONFIG) qt_feature("framework" PUBLIC LABEL "Build Apple Frameworks" CONDITION APPLE AND BUILD_SHARED_LIBS ) qt_feature_definition("framework" "QT_MAC_FRAMEWORK_BUILD") +qt_feature_config("framework" QMAKE_PUBLIC_QT_CONFIG + NAME "qt_framework" +) +qt_feature_config("framework" QMAKE_PUBLIC_CONFIG + NAME "qt_framework" +) qt_feature("largefile" LABEL "Large file support" CONDITION NOT ANDROID AND NOT INTEGRITY AND NOT WINRT AND NOT rtems ) qt_feature_definition("largefile" "QT_LARGEFILE_SUPPORT" VALUE "64") -qt_feature("cxx11" PUBLIC +qt_feature_config("largefile" QMAKE_PRIVATE_CONFIG) +qt_feature("testcocoon" + LABEL "Testcocoon support" + AUTODETECT OFF +) +qt_feature_config("testcocoon" QMAKE_PUBLIC_CONFIG) +qt_feature("coverage_trace_pc_guard" + LABEL "trace-pc-guard" + AUTODETECT OFF +) +qt_feature_config("coverage_trace_pc_guard" QMAKE_PUBLIC_CONFIG) +qt_feature("coverage" + LABEL "Code Coverage Instrumentation" + CONDITION QT_FEATURE_coverage_trace_pc_guard +) +qt_feature_config("coverage" QMAKE_PUBLIC_CONFIG) +qt_feature("plugin-manifests" + LABEL "Embed manifests in plugins" + AUTODETECT OFF + EMIT_IF WIN32 +) +qt_feature_config("plugin-manifests" QMAKE_PUBLIC_CONFIG + NEGATE + NAME "no_plugin_manifest" +) +qt_feature("c++11" PUBLIC LABEL "C++11" ) -qt_feature("cxx14" PUBLIC +qt_feature_config("c++11" QMAKE_PUBLIC_QT_CONFIG) +qt_feature("c++14" PUBLIC LABEL "C++14" CONDITION QT_FEATURE_cxx11 AND TEST_cxx14 ) -qt_feature("cxx17" PUBLIC +qt_feature_config("c++14" QMAKE_PUBLIC_QT_CONFIG) +qt_feature("c++17" PUBLIC LABEL "C++17" CONDITION QT_FEATURE_cxx14 AND TEST_cxx17 ) -qt_feature("cxx1z" PUBLIC +qt_feature_config("c++17" QMAKE_PUBLIC_QT_CONFIG) +qt_feature("c++1z" PUBLIC LABEL "C++17" CONDITION QT_FEATURE_cxx17 ) -qt_feature("cxx2a" PUBLIC +qt_feature_config("c++1z" QMAKE_PUBLIC_QT_CONFIG) +qt_feature("c++2a" PUBLIC LABEL "C++2a" AUTODETECT OFF CONDITION QT_FEATURE_cxx17 AND TEST_cxx2a ) +qt_feature_config("c++2a" QMAKE_PUBLIC_QT_CONFIG) qt_feature("reduce_exports" PRIVATE LABEL "Reduce amount of exported symbols" CONDITION NOT WIN32 AND CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY ) qt_feature_definition("reduce_exports" "QT_VISIBILITY_AVAILABLE") +qt_feature_config("reduce_exports" QMAKE_PUBLIC_QT_CONFIG) qt_feature("signaling_nan" PUBLIC LABEL "Signaling NaN" CONDITION TEST_signaling_nan @@ -383,126 +446,151 @@ qt_feature("sse2" PRIVATE CONDITION ( ( TEST_architecture_arch STREQUAL i386 ) OR ( TEST_architecture_arch STREQUAL x86_64 ) ) AND TEST_subarch_sse2 ) qt_feature_definition("sse2" "QT_COMPILER_SUPPORTS_SSE2" VALUE "1") +qt_feature_config("sse2" QMAKE_PRIVATE_CONFIG) qt_feature("sse3" LABEL "SSE3" CONDITION QT_FEATURE_sse2 AND TEST_subarch_sse3 ) qt_feature_definition("sse3" "QT_COMPILER_SUPPORTS_SSE3" VALUE "1") +qt_feature_config("sse3" QMAKE_PRIVATE_CONFIG) qt_feature("ssse3" LABEL "SSSE3" CONDITION QT_FEATURE_sse3 AND TEST_subarch_ssse3 ) qt_feature_definition("ssse3" "QT_COMPILER_SUPPORTS_SSSE3" VALUE "1") +qt_feature_config("ssse3" QMAKE_PRIVATE_CONFIG) qt_feature("sse4_1" LABEL "SSE4.1" CONDITION QT_FEATURE_ssse3 AND TEST_subarch_sse4_1 ) qt_feature_definition("sse4_1" "QT_COMPILER_SUPPORTS_SSE4_1" VALUE "1") +qt_feature_config("sse4_1" QMAKE_PRIVATE_CONFIG) qt_feature("sse4_2" LABEL "SSE4.2" CONDITION QT_FEATURE_sse4_1 AND TEST_subarch_sse4_2 ) qt_feature_definition("sse4_2" "QT_COMPILER_SUPPORTS_SSE4_2" VALUE "1") +qt_feature_config("sse4_2" QMAKE_PRIVATE_CONFIG) qt_feature("avx" LABEL "AVX" CONDITION QT_FEATURE_sse4_2 AND TEST_subarch_avx ) qt_feature_definition("avx" "QT_COMPILER_SUPPORTS_AVX" VALUE "1") +qt_feature_config("avx" QMAKE_PRIVATE_CONFIG) qt_feature("f16c" LABEL "F16C" CONDITION QT_FEATURE_avx AND TEST_subarch_f16c ) qt_feature_definition("f16c" "QT_COMPILER_SUPPORTS_F16C" VALUE "1") +qt_feature_config("f16c" QMAKE_PRIVATE_CONFIG) qt_feature("avx2" PRIVATE LABEL "AVX2" CONDITION QT_FEATURE_avx AND TEST_subarch_avx2 ) qt_feature_definition("avx2" "QT_COMPILER_SUPPORTS_AVX2" VALUE "1") +qt_feature_config("avx2" QMAKE_PRIVATE_CONFIG) qt_feature("avx512f" LABEL "F" CONDITION QT_FEATURE_avx2 AND TEST_subarch_avx512f ) qt_feature_definition("avx512f" "QT_COMPILER_SUPPORTS_AVX512F" VALUE "1") +qt_feature_config("avx512f" QMAKE_PRIVATE_CONFIG) qt_feature("avx512er" LABEL "ER" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512er ) qt_feature_definition("avx512er" "QT_COMPILER_SUPPORTS_AVX512ER" VALUE "1") +qt_feature_config("avx512er" QMAKE_PRIVATE_CONFIG) qt_feature("avx512cd" LABEL "CD" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512cd ) qt_feature_definition("avx512cd" "QT_COMPILER_SUPPORTS_AVX512CD" VALUE "1") +qt_feature_config("avx512cd" QMAKE_PRIVATE_CONFIG) qt_feature("avx512pf" LABEL "PF" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512pf ) qt_feature_definition("avx512pf" "QT_COMPILER_SUPPORTS_AVX512PF" VALUE "1") +qt_feature_config("avx512pf" QMAKE_PRIVATE_CONFIG) qt_feature("avx512dq" LABEL "DQ" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512dq ) qt_feature_definition("avx512dq" "QT_COMPILER_SUPPORTS_AVX512DQ" VALUE "1") +qt_feature_config("avx512dq" QMAKE_PRIVATE_CONFIG) qt_feature("avx512bw" LABEL "BW" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512bw ) qt_feature_definition("avx512bw" "QT_COMPILER_SUPPORTS_AVX512BW" VALUE "1") +qt_feature_config("avx512bw" QMAKE_PRIVATE_CONFIG) qt_feature("avx512vl" LABEL "VL" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512vl ) qt_feature_definition("avx512vl" "QT_COMPILER_SUPPORTS_AVX512VL" VALUE "1") +qt_feature_config("avx512vl" QMAKE_PRIVATE_CONFIG) qt_feature("avx512ifma" LABEL "IFMA" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512ifma ) qt_feature_definition("avx512ifma" "QT_COMPILER_SUPPORTS_AVX512IFMA" VALUE "1") +qt_feature_config("avx512ifma" QMAKE_PRIVATE_CONFIG) qt_feature("avx512vbmi" LABEL "VBMI" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512vbmi ) qt_feature_definition("avx512vbmi" "QT_COMPILER_SUPPORTS_AVX512VBMI" VALUE "1") +qt_feature_config("avx512vbmi" QMAKE_PRIVATE_CONFIG) qt_feature("aesni" LABEL "AES" CONDITION QT_FEATURE_sse2 AND TEST_subarch_aes ) qt_feature_definition("aesni" "QT_COMPILER_SUPPORTS_AES" VALUE "1") +qt_feature_config("aesni" QMAKE_PRIVATE_CONFIG) qt_feature("rdrnd" LABEL "RDRAND" CONDITION TEST_subarch_rdseed ) qt_feature_definition("rdrnd" "QT_COMPILER_SUPPORTS_RDRND" VALUE "1") +qt_feature_config("rdrnd" QMAKE_PRIVATE_CONFIG) qt_feature("rdseed" LABEL "RDSEED" CONDITION TEST_subarch_rdseed ) qt_feature_definition("rdseed" "QT_COMPILER_SUPPORTS_RDSEED" VALUE "1") +qt_feature_config("rdseed" QMAKE_PRIVATE_CONFIG) qt_feature("shani" LABEL "SHA" CONDITION QT_FEATURE_sse2 AND TEST_subarch_sha ) qt_feature_definition("shani" "QT_COMPILER_SUPPORTS_SHA" VALUE "1") +qt_feature_config("shani" QMAKE_PRIVATE_CONFIG) qt_feature("x86SimdAlways" LABEL "Intrinsics without -mXXX option" CONDITION ( ( TEST_architecture_arch STREQUAL i386 ) OR ( TEST_architecture_arch STREQUAL x86_64 ) ) AND ON ) qt_feature_definition("x86SimdAlways" "QT_COMPILER_SUPPORTS_SIMD_ALWAYS" VALUE "1") +qt_feature_config("x86SimdAlways" QMAKE_PRIVATE_CONFIG) qt_feature("mips_dsp" LABEL "DSP" CONDITION ( TEST_architecture_arch STREQUAL mips ) AND TEST_arch_${TEST_architecture_arch}_subarch_dsp ) qt_feature_definition("mips_dsp" "QT_COMPILER_SUPPORTS_MIPS_DSP" VALUE "1") +qt_feature_config("mips_dsp" QMAKE_PRIVATE_CONFIG) qt_feature("mips_dspr2" LABEL "DSPr2" CONDITION ( TEST_architecture_arch STREQUAL mips ) AND TEST_arch_${TEST_architecture_arch}_subarch_dspr2 ) qt_feature_definition("mips_dspr2" "QT_COMPILER_SUPPORTS_MIPS_DSPR2" VALUE "1") +qt_feature_config("mips_dspr2" QMAKE_PRIVATE_CONFIG) qt_feature("neon" LABEL "NEON" CONDITION ( ( TEST_architecture_arch STREQUAL arm ) OR ( TEST_architecture_arch STREQUAL arm64 ) ) AND TEST_arch_${TEST_architecture_arch}_subarch_neon ) qt_feature_definition("neon" "QT_COMPILER_SUPPORTS_NEON" VALUE "1") +qt_feature_config("neon" QMAKE_PRIVATE_CONFIG) qt_feature("alloca_h" PRIVATE LABEL "alloca.h" CONDITION TEST_alloca_h @@ -544,7 +632,7 @@ qt_feature("dbus" PUBLIC PRIVATE CONDITION QT_FEATURE_thread ) qt_feature_definition("dbus" "QT_NO_DBUS" NEGATE VALUE "1") -qt_feature("dbus_linked" PRIVATE +qt_feature("dbus-linked" PRIVATE LABEL "Qt D-Bus directly linked to libdbus" CONDITION QT_FEATURE_dbus AND DBus1_FOUND ENABLE INPUT_dbus STREQUAL 'linked' @@ -553,6 +641,8 @@ qt_feature("dbus_linked" PRIVATE qt_feature("gui" PRIVATE LABEL "Qt Gui" ) +qt_feature_config("gui" QMAKE_PUBLIC_QT_CONFIG + NEGATE) qt_feature("network" PRIVATE LABEL "Qt Network" ) @@ -569,6 +659,8 @@ qt_feature("widgets" PRIVATE CONDITION QT_FEATURE_gui ) qt_feature_definition("widgets" "QT_NO_WIDGETS" NEGATE) +qt_feature_config("widgets" QMAKE_PUBLIC_QT_CONFIG + NEGATE) qt_feature("xml" PRIVATE LABEL "Qt Xml" ) @@ -576,6 +668,17 @@ qt_feature("libudev" PRIVATE LABEL "udev" CONDITION Libudev_FOUND ) +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' ) +) +qt_feature_config("qt_libinfix_plugins" QMAKE_PRIVATE_CONFIG) +qt_feature("compile_examples" + LABEL "Compile examples" + AUTODETECT NOT WASM +) +qt_feature_config("compile_examples" QMAKE_PRIVATE_CONFIG) qt_feature("dlopen" PRIVATE LABEL "dlopen()" CONDITION UNIX diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 260ee88014..4e97964b8c 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -502,15 +502,15 @@ qDoubleSscanf(argv[0], invalidLocale, \"invalid format\", &a, &argc); #### Features -qt_feature("clock_gettime" PRIVATE +qt_feature("clock-gettime" PRIVATE LABEL "clock_gettime()" CONDITION UNIX AND WrapRt_FOUND ) -qt_feature("clock_monotonic" PUBLIC +qt_feature("clock-monotonic" PUBLIC LABEL "POSIX monotonic clock" CONDITION QT_FEATURE_clock_gettime AND TEST_clock_monotonic ) -qt_feature_definition("clock_monotonic" "QT_NO_CLOCK_MONOTONIC" NEGATE VALUE "1") +qt_feature_definition("clock-monotonic" "QT_NO_CLOCK_MONOTONIC" NEGATE VALUE "1") qt_feature("cxx11_future" PUBLIC LABEL "C++11 <future>" CONDITION TEST_cxx11_future @@ -554,19 +554,19 @@ qt_feature("iconv" PUBLIC PRIVATE CONDITION NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv ) ) qt_feature_definition("iconv" "QT_NO_ICONV" NEGATE VALUE "1") -qt_feature("posix_libiconv" PRIVATE +qt_feature("posix-libiconv" PRIVATE LABEL "POSIX iconv" CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv AND TEST_iconv_needlib ENABLE TEST_posix_iconv AND TEST_iconv_needlib DISABLE NOT TEST_posix_iconv OR NOT TEST_iconv_needlib ) -qt_feature("sun_libiconv" +qt_feature("sun-libiconv" LABEL "SUN iconv" CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_sun_iconv ENABLE TEST_sun_iconv DISABLE NOT TEST_sun_iconv ) -qt_feature("gnu_libiconv" PRIVATE +qt_feature("gnu-libiconv" PRIVATE LABEL "GNU iconv" CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv AND NOT TEST_iconv_needlib ENABLE TEST_posix_iconv AND NOT TEST_iconv_needlib @@ -599,7 +599,7 @@ qt_feature("linkat" PRIVATE AUTODETECT LINUX AND NOT ANDROID CONDITION TEST_linkat ) -qt_feature("std_atomic64" PUBLIC +qt_feature("std-atomic64" PUBLIC LABEL "64 bit atomic operations" CONDITION Atomic_FOUND ) @@ -610,10 +610,16 @@ qt_feature("mimetype" PUBLIC CONDITION QT_FEATURE_textcodec ) qt_feature_definition("mimetype" "QT_NO_MIMETYPE" NEGATE VALUE "1") -qt_feature("mimetype_database" PRIVATE +qt_feature("mimetype-database" PRIVATE LABEL "Built-in copy of the MIME database" CONDITION QT_FEATURE_mimetype ) +qt_feature("pcre2" + LABEL "PCRE2" + ENABLE INPUT_pcre STREQUAL 'qt' + DISABLE INPUT_pcre STREQUAL 'no' OR INPUT_pcre STREQUAL 'system' +) +qt_feature_config("pcre2" QMAKE_PRIVATE_CONFIG) qt_feature("poll_ppoll" PRIVATE LABEL "Native ppoll()" CONDITION NOT WASM AND TEST_ppoll @@ -657,11 +663,12 @@ qt_feature("syslog" PRIVATE AUTODETECT OFF CONDITION TEST_syslog ) -qt_feature("threadsafe_cloexec" +qt_feature("threadsafe-cloexec" LABEL "Threadsafe pipe creation" CONDITION TEST_cloexec ) -qt_feature_definition("threadsafe_cloexec" "QT_THREADSAFE_CLOEXEC" VALUE "1") +qt_feature_definition("threadsafe-cloexec" "QT_THREADSAFE_CLOEXEC" VALUE "1") +qt_feature_config("threadsafe-cloexec" QMAKE_PUBLIC_QT_CONFIG) qt_feature("properties" PUBLIC SECTION "Kernel" LABEL "Properties" @@ -876,7 +883,7 @@ qt_feature("gestures" PUBLIC PURPOSE "Provides a framework for gestures." ) qt_feature_definition("gestures" "QT_NO_GESTURES" NEGATE VALUE "1") -qt_feature("sha3_fast" PRIVATE +qt_feature("sha3-fast" PRIVATE SECTION "Utilities" LABEL "Speed optimized SHA3" PURPOSE "Optimizes SHA3 for speed instead of size." diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 932132a5f8..11723b785b 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -521,11 +521,11 @@ xcb_xkb_get_kbd_by_name_replies_key_names_value_list_sizeof(nullptr, 0, 0, 0, 0, #### Features -qt_feature("accessibility_atspi_bridge" PUBLIC PRIVATE +qt_feature("accessibility-atspi-bridge" PUBLIC PRIVATE LABEL "ATSPI Bridge" CONDITION QT_FEATURE_accessibility AND QT_FEATURE_xcb AND QT_FEATURE_dbus AND ATSPI2_FOUND ) -qt_feature_definition("accessibility_atspi_bridge" "QT_NO_ACCESSIBILITY_ATSPI_BRIDGE" NEGATE VALUE "1") +qt_feature_definition("accessibility-atspi-bridge" "QT_NO_ACCESSIBILITY_ATSPI_BRIDGE" NEGATE VALUE "1") qt_feature("angle" PUBLIC LABEL "ANGLE" AUTODETECT QT_FEATURE_opengles2 OR QT_FEATURE_opengl_dynamic @@ -536,7 +536,7 @@ qt_feature("angle_d3d11_qdtd" PRIVATE LABEL "D3D11_QUERY_DATA_TIMESTAMP_DISJOINT" CONDITION QT_FEATURE_angle AND TEST_angle_d3d11_qdtd ) -qt_feature("combined_angle_lib" PUBLIC +qt_feature("combined-angle-lib" PUBLIC LABEL "Combined ANGLE Library" AUTODETECT OFF CONDITION QT_FEATURE_angle @@ -610,6 +610,11 @@ qt_feature("fontconfig" PUBLIC PRIVATE CONDITION NOT MSVC AND ON AND FONTCONFIG_FOUND ) qt_feature_definition("fontconfig" "QT_NO_FONTCONFIG" NEGATE VALUE "1") +qt_feature("gbm" + LABEL "GBM" + CONDITION gbm_FOUND +) +qt_feature_config("gbm" QMAKE_PUBLIC_QT_CONFIG) qt_feature("harfbuzz" PUBLIC PRIVATE LABEL "HarfBuzz" CONDITION harfbuzz_FOUND @@ -629,6 +634,7 @@ qt_feature("kms" PRIVATE LABEL "KMS" CONDITION Libdrm_FOUND ) +qt_feature_config("kms" QMAKE_PUBLIC_QT_CONFIG) qt_feature("drm_atomic" PRIVATE LABEL "DRM Atomic API" CONDITION Libdrm_FOUND AND TEST_drm_atomic @@ -641,10 +647,16 @@ qt_feature("integrityhid" PRIVATE LABEL "INTEGRITY HID" CONDITION INTEGRITY AND libs.integrityhid OR FIXME ) -qt_feature("libinput_axis_api" PRIVATE +qt_feature("libinput-axis-api" PRIVATE LABEL "axis API in libinput" CONDITION QT_FEATURE_libinput AND ON ) +qt_feature("lgmon" + LABEL "lgmon" + CONDITION libs.lgmon OR FIXME + EMIT_IF QNX +) +qt_feature_config("lgmon" QMAKE_PRIVATE_CONFIG) qt_feature("linuxfb" PRIVATE SECTION "Platform plugins" LABEL "LinuxFB" @@ -672,6 +684,7 @@ qt_feature("opengles2" PUBLIC ) qt_feature_definition("opengles2" "QT_OPENGL_ES") qt_feature_definition("opengles2" "QT_OPENGL_ES_2") +qt_feature_config("opengles2" QMAKE_PUBLIC_QT_CONFIG) qt_feature("opengles3" PUBLIC LABEL "OpenGL ES 3.0" CONDITION QT_FEATURE_opengles2 AND NOT QT_FEATURE_angle AND TEST_opengles3 AND NOT WASM @@ -687,13 +700,13 @@ qt_feature("opengles32" PUBLIC CONDITION QT_FEATURE_opengles31 AND TEST_opengles32 ) qt_feature_definition("opengles32" "QT_OPENGL_ES_3_2") -qt_feature("opengl_desktop" +qt_feature("opengl-desktop" LABEL "Desktop OpenGL" CONDITION ( WIN32 AND NOT WINRT AND NOT QT_FEATURE_opengles2 AND ( MSVC OR OpenGL_OpenGL_FOUND ) ) OR ( NOT APPLE_WATCHOS AND NOT WIN32 AND NOT WASM AND OpenGL_OpenGL_FOUND ) ENABLE INPUT_opengl STREQUAL 'desktop' DISABLE INPUT_opengl STREQUAL 'es2' OR INPUT_opengl STREQUAL 'dynamic' OR INPUT_opengl STREQUAL 'no' ) -qt_feature("opengl_dynamic" +qt_feature("opengl-dynamic" LABEL "Dynamic OpenGL" AUTODETECT OFF CONDITION WIN32 AND NOT WINRT @@ -704,7 +717,7 @@ qt_feature("dynamicgl" PUBLIC CONDITION QT_FEATURE_opengl_dynamic DISABLE INPUT_angle STREQUAL 'yes' OR INPUT_opengl STREQUAL 'no' OR INPUT_opengl STREQUAL 'desktop' ) -qt_feature_definition("opengl_dynamic" "QT_OPENGL_DYNAMIC") +qt_feature_definition("opengl-dynamic" "QT_OPENGL_DYNAMIC") qt_feature("opengl" PUBLIC LABEL "OpenGL" CONDITION QT_FEATURE_opengl_desktop OR QT_FEATURE_opengl_dynamic OR QT_FEATURE_opengles2 @@ -818,22 +831,22 @@ qt_feature("xcb" PRIVATE AUTODETECT NOT APPLE CONDITION QT_FEATURE_thread AND TARGET XCB::XCB AND TEST_xcb_syslibs AND QT_FEATURE_xkbcommon_x11 ) -qt_feature("xcb_glx_plugin" PRIVATE +qt_feature("xcb-glx-plugin" PRIVATE LABEL "GLX Plugin" CONDITION QT_FEATURE_xcb_xlib AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 EMIT_IF QT_FEATURE_xcb ) -qt_feature("xcb_glx" PRIVATE +qt_feature("xcb-glx" PRIVATE LABEL " XCB GLX" CONDITION XCB_GLX_FOUND EMIT_IF QT_FEATURE_xcb AND QT_FEATURE_xcb_glx_plugin ) -qt_feature("xcb_egl_plugin" PRIVATE +qt_feature("xcb-egl-plugin" PRIVATE LABEL "EGL-X11 Plugin" CONDITION QT_FEATURE_egl_x11 AND QT_FEATURE_opengl EMIT_IF QT_FEATURE_xcb ) -qt_feature("xcb_native_painting" PRIVATE +qt_feature("xcb-native-painting" PRIVATE LABEL "Native painting (experimental)" AUTODETECT OFF CONDITION QT_FEATURE_xcb_xlib AND QT_FEATURE_fontconfig AND XRender_FOUND @@ -844,16 +857,16 @@ qt_feature("xrender" PRIVATE CONDITION QT_FEATURE_xcb_native_painting EMIT_IF QT_FEATURE_xcb AND QT_FEATURE_xcb_native_painting ) -qt_feature("xcb_xlib" PRIVATE +qt_feature("xcb-xlib" PRIVATE LABEL "XCB Xlib" CONDITION QT_FEATURE_xlib AND X11_XCB_FOUND ) -qt_feature("xcb_sm" PRIVATE +qt_feature("xcb-sm" PRIVATE LABEL "xcb-sm" CONDITION QT_FEATURE_sessionmanager AND X11_SM_FOUND EMIT_IF QT_FEATURE_xcb ) -qt_feature("system_xcb_xinput" PRIVATE +qt_feature("system-xcb-xinput" PRIVATE LABEL "Using system-provided xcb-xinput" CONDITION XCB_XINPUT_FOUND ENABLE INPUT_bundled_xcb_xinput STREQUAL 'no' @@ -864,7 +877,7 @@ qt_feature("xkbcommon" PRIVATE LABEL "xkbcommon" CONDITION XKB_FOUND ) -qt_feature("xkbcommon_x11" PRIVATE +qt_feature("xkbcommon-x11" PRIVATE LABEL "xkbcommon-x11" CONDITION QT_FEATURE_xkbcommon AND XKB_FOUND ) @@ -886,7 +899,7 @@ qt_feature("textmarkdownreader" PUBLIC ENABLE INPUT_libmd4c STREQUAL 'system' OR INPUT_libmd4c STREQUAL 'qt' OR INPUT_libmd4c STREQUAL 'yes' DISABLE INPUT_libmd4c STREQUAL 'no' ) -qt_feature("system_textmarkdownreader" PUBLIC +qt_feature("system-textmarkdownreader" PUBLIC SECTION "Kernel" LABEL " Using system libmd4c" CONDITION libs.libmd4c OR FIXME @@ -1086,7 +1099,7 @@ qt_feature("whatsthis" PUBLIC PURPOSE "Supports displaying \"What's this\" help." ) qt_feature_definition("whatsthis" "QT_NO_WHATSTHIS" NEGATE VALUE "1") -qt_feature("raster_64bit" PRIVATE +qt_feature("raster-64bit" PRIVATE SECTION "Painting" LABEL "QPainter - 64 bit raster" PURPOSE "Internal painting support for 64 bit (16 bpc) rasterization." diff --git a/src/network/configure.cmake b/src/network/configure.cmake index 2e32149908..9046464cf4 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -204,7 +204,7 @@ qt_feature("libproxy" PRIVATE AUTODETECT OFF CONDITION Libproxy_FOUND ) -qt_feature("linux_netlink" PRIVATE +qt_feature("linux-netlink" PRIVATE LABEL "Linux AF_NETLINK" CONDITION LINUX AND TEST_linux_netlink ) @@ -214,19 +214,20 @@ qt_feature("openssl" PRIVATE ENABLE false ) qt_feature_definition("openssl" "QT_NO_OPENSSL" NEGATE) -qt_feature("openssl_runtime" +qt_feature_config("openssl" QMAKE_PUBLIC_QT_CONFIG) +qt_feature("openssl-runtime" AUTODETECT NOT WINRT AND NOT WASM CONDITION NOT QT_FEATURE_securetransport AND NOT QT_FEATURE_schannel AND OPENSSL_INCLUDE_DIR ENABLE INPUT_openssl STREQUAL 'yes' OR INPUT_openssl STREQUAL 'runtime' DISABLE INPUT_openssl STREQUAL 'no' OR INPUT_openssl STREQUAL 'linked' OR INPUT_ssl STREQUAL 'no' ) -qt_feature("openssl_linked" PRIVATE +qt_feature("openssl-linked" PRIVATE LABEL " Qt directly linked to OpenSSL" AUTODETECT OFF CONDITION NOT QT_FEATURE_securetransport AND NOT QT_FEATURE_schannel AND OpenSSL_FOUND ENABLE INPUT_openssl STREQUAL 'linked' ) -qt_feature_definition("openssl_linked" "QT_LINKED_OPENSSL") +qt_feature_definition("openssl-linked" "QT_LINKED_OPENSSL") qt_feature("securetransport" PUBLIC LABEL "SecureTransport" CONDITION APPLE AND ( INPUT_openssl STREQUAL '' OR INPUT_openssl STREQUAL 'no' ) @@ -266,7 +267,7 @@ qt_feature("sctp" PUBLIC CONDITION TEST_sctp ) qt_feature_definition("sctp" "QT_NO_SCTP" NEGATE VALUE "1") -qt_feature("system_proxies" PRIVATE +qt_feature("system-proxies" PRIVATE LABEL "Use system proxies" ) qt_feature("ftp" PUBLIC diff --git a/src/plugins/sqldrivers/configure.cmake b/src/plugins/sqldrivers/configure.cmake index e34200bf8f..c8005e16a7 100644 --- a/src/plugins/sqldrivers/configure.cmake +++ b/src/plugins/sqldrivers/configure.cmake @@ -20,39 +20,39 @@ qt_find_package(SQLite3 PROVIDED_TARGETS SQLite::SQLite3) #### Features -qt_feature("sql_db2" PRIVATE +qt_feature("sql-db2" PRIVATE LABEL "DB2 (IBM)" CONDITION DB2_FOUND ) -qt_feature("sql_ibase" PRIVATE +qt_feature("sql-ibase" PRIVATE LABEL "InterBase" CONDITION libs.ibase OR FIXME ) -qt_feature("sql_mysql" PRIVATE +qt_feature("sql-mysql" PRIVATE LABEL "MySql" CONDITION MySQL_FOUND ) -qt_feature("sql_oci" PRIVATE +qt_feature("sql-oci" PRIVATE LABEL "OCI (Oracle)" CONDITION Oracle_FOUND ) -qt_feature("sql_odbc" PRIVATE +qt_feature("sql-odbc" PRIVATE LABEL "ODBC" CONDITION QT_FEATURE_datestring AND ODBC_FOUND ) -qt_feature("sql_psql" PRIVATE +qt_feature("sql-psql" PRIVATE LABEL "PostgreSQL" CONDITION PostgreSQL_FOUND ) -qt_feature("sql_sqlite2" PRIVATE +qt_feature("sql-sqlite2" PRIVATE LABEL "SQLite2" CONDITION libs.sqlite2 OR FIXME ) -qt_feature("sql_sqlite" PRIVATE +qt_feature("sql-sqlite" PRIVATE LABEL "SQLite" CONDITION QT_FEATURE_datestring AND SQLite3_FOUND ) -qt_feature("sql_tds" PRIVATE +qt_feature("sql-tds" PRIVATE LABEL "TDS (Sybase)" CONDITION QT_FEATURE_datestring AND libs.tds OR FIXME ) diff --git a/src/widgets/configure.cmake b/src/widgets/configure.cmake index e07d023dad..c508e2dbf4 100644 --- a/src/widgets/configure.cmake +++ b/src/widgets/configure.cmake @@ -20,31 +20,31 @@ qt_feature("gtk3" PRIVATE AUTODETECT NOT APPLE CONDITION QT_FEATURE_glib AND GTK3_FOUND ) -qt_feature("style_fusion" PRIVATE +qt_feature("style-fusion" PRIVATE LABEL "Fusion" ) -qt_feature("style_mac" PRIVATE +qt_feature("style-mac" PRIVATE LABEL "macOS" CONDITION APPLE_OSX AND QT_FEATURE_animation ) -qt_feature("style_windows" PRIVATE +qt_feature("style-windows" PRIVATE LABEL "Windows" ) -qt_feature("style_windowsvista" PRIVATE +qt_feature("style-windowsvista" PRIVATE LABEL "WindowsVista" CONDITION QT_FEATURE_style_windows AND QT_FEATURE_animation AND WIN32 AND NOT WINRT AND tests.uxtheme OR FIXME ) -qt_feature("style_android" PRIVATE +qt_feature("style-android" PRIVATE LABEL "Android" AUTODETECT ANDROID ) -qt_feature("style_stylesheet" PUBLIC +qt_feature("style-stylesheet" PUBLIC SECTION "Styles" LABEL "QStyleSheetStyle" PURPOSE "Provides a widget style which is configurable via CSS." CONDITION QT_FEATURE_style_windows AND QT_FEATURE_properties AND QT_FEATURE_cssparser ) -qt_feature_definition("style_stylesheet" "QT_NO_STYLE_STYLESHEET" NEGATE VALUE "1") +qt_feature_definition("style-stylesheet" "QT_NO_STYLE_STYLESHEET" NEGATE VALUE "1") qt_feature("effects" PRIVATE SECTION "Kernel" LABEL "Effects" |