diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/configure.cmake | 14 | ||||
-rw-r--r-- | src/gui/configure.cmake | 14 | ||||
-rw-r--r-- | src/network/configure.cmake | 6 |
3 files changed, 20 insertions, 14 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 73881a8668..38eac75a41 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -403,9 +403,9 @@ qt_feature("iconv" PUBLIC PRIVATE qt_feature_definition("iconv" "QT_NO_ICONV" NEGATE VALUE "1") qt_feature("posix_libiconv" PRIVATE LABEL "POSIX iconv" - CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv - ENABLE INPUT_iconv STREQUAL 'posix' - DISABLE INPUT_iconv STREQUAL 'sun' OR INPUT_iconv STREQUAL 'gnu' OR INPUT_iconv STREQUAL 'no' + 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" LABEL "SUN iconv" @@ -429,7 +429,7 @@ qt_feature("inotify" PUBLIC PRIVATE CONDITION TEST_inotify ) qt_feature_definition("inotify" "QT_NO_INOTIFY" NEGATE VALUE "1") -qt_feature("ipc_posix" PUBLIC +qt_feature("ipc_posix" LABEL "Using POSIX IPC" AUTODETECT NOT WIN32 CONDITION NOT TEST_ipc_sysv AND TEST_ipc_posix @@ -472,7 +472,7 @@ qt_feature("poll_poll" PRIVATE CONDITION NOT QT_FEATURE_poll_ppoll AND NOT QT_FEATURE_poll_pollts AND TEST_poll EMIT_IF NOT WIN32 ) -qt_feature("poll_select" PUBLIC PRIVATE +qt_feature("poll_select" PRIVATE LABEL "Emulated poll()" CONDITION NOT QT_FEATURE_poll_ppoll AND NOT QT_FEATURE_poll_pollts AND NOT QT_FEATURE_poll_poll EMIT_IF NOT WIN32 @@ -500,7 +500,7 @@ qt_feature("syslog" PRIVATE AUTODETECT OFF CONDITION TEST_syslog ) -qt_feature("threadsafe_cloexec" PUBLIC +qt_feature("threadsafe_cloexec" LABEL "Threadsafe pipe creation" CONDITION TEST_cloexec ) @@ -587,7 +587,7 @@ qt_feature("library" PUBLIC SECTION "File I/O" LABEL "QLibrary" PURPOSE "Provides a wrapper for dynamically loaded libraries." - CONDITION WIN32 OR HPUX OR ( NOT NACL AND UNIX ) + CONDITION WIN32 OR HPUX OR ( NOT NACL AND ON ) ) qt_feature_definition("library" "QT_NO_LIBRARY" NEGATE VALUE "1") qt_feature("settings" PUBLIC diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 03a3734691..157898953e 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -562,12 +562,18 @@ qt_feature("opengl_desktop" ENABLE INPUT_opengl STREQUAL 'desktop' DISABLE INPUT_opengl STREQUAL 'es2' OR INPUT_opengl STREQUAL 'dynamic' OR INPUT_opengl STREQUAL 'no' ) -qt_feature("opengl_dynamic" PUBLIC +qt_feature("opengl_dynamic" LABEL "Dynamic OpenGL" AUTODETECT OFF CONDITION WIN32 AND NOT WINRT ENABLE INPUT_opengl STREQUAL 'dynamic' ) +qt_feature("dynamicgl" PUBLIC + LABEL "Dynamic OpenGL: dynamicgl" + AUTODETECT OFF + CONDITION WIN32 AND NOT WINRT + ENABLE INPUT_opengl STREQUAL 'dynamic' +) qt_feature_definition("opengl_dynamic" "QT_OPENGL_DYNAMIC") qt_feature("opengl" PUBLIC LABEL "OpenGL" @@ -632,7 +638,7 @@ qt_feature("eglfs_openwfd" PRIVATE LABEL "EGLFS OpenWFD" CONDITION INTEGRITY AND QT_FEATURE_eglfs AND TEST_egl_openwfd ) -qt_feature("gif" PUBLIC PRIVATE +qt_feature("gif" PRIVATE LABEL "GIF" CONDITION QT_FEATURE_imageformatplugin ) @@ -642,13 +648,13 @@ qt_feature("ico" PUBLIC PRIVATE CONDITION QT_FEATURE_imageformatplugin ) qt_feature_definition("ico" "QT_NO_ICO" NEGATE VALUE "1") -qt_feature("jpeg" PUBLIC PRIVATE +qt_feature("jpeg" PRIVATE LABEL "JPEG" CONDITION QT_FEATURE_imageformatplugin AND JPEG_FOUND DISABLE INPUT_libjpeg STREQUAL 'no' ) qt_feature_definition("jpeg" "QT_NO_IMAGEFORMAT_JPEG" NEGATE) -qt_feature("png" PUBLIC PRIVATE +qt_feature("png" PRIVATE LABEL "PNG" DISABLE INPUT_libpng STREQUAL 'no' ) diff --git a/src/network/configure.cmake b/src/network/configure.cmake index e2c4d20d63..38a3ff3099 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -156,7 +156,7 @@ qt_feature("linux_netlink" PRIVATE LABEL "Linux AF_NETLINK" CONDITION LINUX AND TEST_linux_netlink ) -qt_feature("openssl" PUBLIC PRIVATE +qt_feature("openssl" PRIVATE LABEL "OpenSSL" AUTODETECT NOT WINRT AND NOT WASM CONDITION NOT QT_FEATURE_securetransport AND ( QT_FEATURE_openssl_linked OR OPENSSL_INCLUDE_DIR ) @@ -164,14 +164,14 @@ qt_feature("openssl" PUBLIC PRIVATE DISABLE INPUT_openssl STREQUAL 'no' OR INPUT_ssl STREQUAL 'no' ) qt_feature_definition("openssl" "QT_NO_OPENSSL" NEGATE) -qt_feature("openssl_linked" PUBLIC PRIVATE +qt_feature("openssl_linked" PRIVATE LABEL " Qt directly linked to OpenSSL" CONDITION NOT QT_FEATURE_securetransport AND OpenSSL_FOUND ENABLE INPUT_openssl STREQUAL 'linked' DISABLE ( NOT INPUT_openssl STREQUAL 'linked' ) ) qt_feature_definition("openssl_linked" "QT_LINKED_OPENSSL") -qt_feature("securetransport" PUBLIC PRIVATE +qt_feature("securetransport" PRIVATE LABEL "SecureTransport" CONDITION APPLE AND ( INPUT_openssl STREQUAL '' OR INPUT_openssl STREQUAL 'no' ) DISABLE INPUT_securetransport STREQUAL 'no' OR INPUT_ssl STREQUAL 'no' |