diff options
Diffstat (limited to 'devel/qt6-base')
14 files changed, 187 insertions, 133 deletions
diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index 048dc7a6f13c..3f62825bb99f 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -55,7 +55,6 @@ CMAKE_OFF+= FEATURE_sql_mysql \ SHEBANG_FILES= ${WRKSRC}/mkspecs/features/uikit/device_destinations.sh \ ${WRKSRC}/mkspecs/features/uikit/devices.py \ ${WRKSRC}/mkspecs/features/data/mac/objc_namespace.sh \ - ${WRKSRC}/util/android/android_emulator_launcher.sh \ ${WRKSRC}/util/testrunner/qt-testrunner.py \ ${WRKSRC}/util/testrunner/sanitizer-testrunner.py USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo index 356bc1c3352b..cf1cfad7821c 100644 --- a/devel/qt6-base/distinfo +++ b/devel/qt6-base/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1711661021 -SHA256 (KDE/Qt/6.6.3/qtbase-everywhere-src-6.6.3.tar.xz) = 0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462 -SIZE (KDE/Qt/6.6.3/qtbase-everywhere-src-6.6.3.tar.xz) = 48784716 +TIMESTAMP = 1718777702 +SHA256 (KDE/Qt/6.7.2/qtbase-everywhere-src-6.7.2.tar.xz) = c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599 +SIZE (KDE/Qt/6.7.2/qtbase-everywhere-src-6.7.2.tar.xz) = 49364504 diff --git a/devel/qt6-base/files/patch-cmake_FindMySQL.cmake b/devel/qt6-base/files/patch-cmake_FindMySQL.cmake new file mode 100644 index 000000000000..3d94148a38ae --- /dev/null +++ b/devel/qt6-base/files/patch-cmake_FindMySQL.cmake @@ -0,0 +1,13 @@ +Use pkgconf to set hints for MariaDB, as well. + +--- cmake/FindMySQL.cmake.orig 2024-05-08 09:42:08 UTC ++++ cmake/FindMySQL.cmake +@@ -43,7 +43,7 @@ if(PkgConfig_FOUND AND NOT DEFINED MySQL_ROOT) + find_package(PkgConfig QUIET) + endif() + if(PkgConfig_FOUND AND NOT DEFINED MySQL_ROOT) +- pkg_check_modules(PC_MySQL QUIET "mysqlclient") ++ pkg_search_module(PC_MySQL QUIET "libmariadb" "mysqlclient") + set(MySQL_include_dir_hints ${PC_MySQL_INCLUDEDIR}) + set(MySQL_library_hints ${PC_MySQL_LIBDIR}) + set(MySQL_library_hints_debug "") diff --git a/devel/qt6-base/files/patch-cmake_QtBuildPathsHelpers.cmake b/devel/qt6-base/files/patch-cmake_QtBuildPathsHelpers.cmake index 8df0968ae885..d1c33877dc66 100644 --- a/devel/qt6-base/files/patch-cmake_QtBuildPathsHelpers.cmake +++ b/devel/qt6-base/files/patch-cmake_QtBuildPathsHelpers.cmake @@ -1,4 +1,4 @@ ---- cmake/QtBuildPathsHelpers.cmake.orig 2024-02-08 16:01:05 UTC +--- cmake/QtBuildPathsHelpers.cmake.orig 2023-09-15 10:20:51 UTC +++ cmake/QtBuildPathsHelpers.cmake @@ -100,7 +100,7 @@ function(qt_internal_setup_build_and_install_paths) if(QT_CONFIG_INSTALL_DIR) diff --git a/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake b/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake index a1e02bb2b362..39f338bc0a6a 100644 --- a/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake +++ b/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake @@ -1,6 +1,6 @@ ---- cmake/QtFlagHandlingHelpers.cmake.orig 2023-11-15 13:58:42 UTC +--- cmake/QtFlagHandlingHelpers.cmake.orig 2023-09-15 10:20:51 UTC +++ cmake/QtFlagHandlingHelpers.cmake -@@ -132,6 +132,10 @@ function(qt_internal_add_link_flags_no_undefined targe +@@ -167,6 +167,10 @@ function(qt_internal_add_link_flags_no_undefined targe set(no_undefined_flag "-Wl,--no-undefined") endif() diff --git a/devel/qt6-base/files/patch-src_corelib_global_qcompare.h b/devel/qt6-base/files/patch-src_corelib_global_qcompare.h new file mode 100644 index 000000000000..dca740aacab1 --- /dev/null +++ b/devel/qt6-base/files/patch-src_corelib_global_qcompare.h @@ -0,0 +1,37 @@ +Also disable spurious zero as null pointer constant warnings for Clang which +are errors in www/dooble due to -Werror being passed. + +--- src/corelib/global/qcompare.h.orig 2024-01-22 10:20:09 UTC ++++ src/corelib/global/qcompare.h +@@ -195,6 +195,7 @@ class partial_ordering (private) + + QT_WARNING_PUSH + // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903 ++ QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") + QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant") + friend constexpr bool is_eq (partial_ordering o) noexcept { return o == 0; } + friend constexpr bool is_neq (partial_ordering o) noexcept { return o != 0; } +@@ -380,6 +381,7 @@ class weak_ordering (private) + + QT_WARNING_PUSH + // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903 ++ QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") + QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant") + friend constexpr bool is_eq (weak_ordering o) noexcept { return o == 0; } + friend constexpr bool is_neq (weak_ordering o) noexcept { return o != 0; } +@@ -575,6 +577,7 @@ class strong_ordering (public) + + QT_WARNING_PUSH + // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903 ++ QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") + QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant") + friend constexpr bool is_eq (strong_ordering o) noexcept { return o == 0; } + friend constexpr bool is_neq (strong_ordering o) noexcept { return o != 0; } +@@ -859,6 +862,7 @@ class QPartialOrdering (private) + + QT_WARNING_PUSH + // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903 ++ QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") + QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant") + friend constexpr bool is_eq (QPartialOrdering o) noexcept { return o == 0; } + friend constexpr bool is_neq (QPartialOrdering o) noexcept { return o != 0; } diff --git a/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h b/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h new file mode 100644 index 000000000000..f28c5a926a13 --- /dev/null +++ b/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h @@ -0,0 +1,49 @@ +Suppress spurious zero as null pointer constant warnings which cause errors +in www/dooble due to -Werror being passed. This is the same problem as in +qcompare.h that upstream suppresses for GCC. + +/usr/local/include/qt6/QtCore/qfloat16.h:209:5: error: zero as null pointer constant [-Werror,-Wzero-as-null-pointer-constant] +... +/usr/local/include/qt6/QtCore/qcomparehelpers.h:211:43: note: expanded from macro 'QT_DECLARE_ORDERING_HELPER_TEMPLATE' + 211 | { return compareThreeWay(lhs, rhs) >= 0; } + +--- src/corelib/global/qcomparehelpers.h.orig 2024-01-22 10:20:09 UTC ++++ src/corelib/global/qcomparehelpers.h +@@ -197,6 +197,8 @@ template <typename In> constexpr auto to_Qt(In in) noe + { return !comparesEqual(rhs, lhs); } + + #define QT_DECLARE_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr) \ ++ QT_WARNING_PUSH \ ++ QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \ + friend Constexpr bool operator<(LeftType const &lhs, RightType const &rhs) \ + noexcept(noexcept(compareThreeWay(lhs, rhs))) \ + { return compareThreeWay(lhs, rhs) < 0; } \ +@@ -208,7 +210,8 @@ template <typename In> constexpr auto to_Qt(In in) noe + { return compareThreeWay(lhs, rhs) <= 0; } \ + friend Constexpr bool operator>=(LeftType const &lhs, RightType const &rhs) \ + noexcept(noexcept(compareThreeWay(lhs, rhs))) \ +- { return compareThreeWay(lhs, rhs) >= 0; } ++ { return compareThreeWay(lhs, rhs) >= 0; } \ ++ QT_WARNING_POP + + #define QT_DECLARE_ORDERING_HELPER_PARTIAL(LeftType, RightType, Constexpr) \ + QT_DECLARE_ORDERING_HELPER_TEMPLATE(Qt::partial_ordering, LeftType, RightType, Constexpr) +@@ -225,6 +228,8 @@ template <typename In> constexpr auto to_Qt(In in) noe + + // Helpers for reversed ordering, using the existing compareThreeWay() function. + #define QT_DECLARE_REVERSED_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr) \ ++ QT_WARNING_PUSH \ ++ QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \ + friend Constexpr bool operator<(RightType const &lhs, LeftType const &rhs) \ + noexcept(noexcept(compareThreeWay(rhs, lhs))) \ + { return compareThreeWay(rhs, lhs) > 0; } \ +@@ -236,7 +241,8 @@ template <typename In> constexpr auto to_Qt(In in) noe + { return compareThreeWay(rhs, lhs) >= 0; } \ + friend Constexpr bool operator>=(RightType const &lhs, LeftType const &rhs) \ + noexcept(noexcept(compareThreeWay(rhs, lhs))) \ +- { return compareThreeWay(rhs, lhs) <= 0; } ++ { return compareThreeWay(rhs, lhs) <= 0; } \ ++ QT_WARNING_POP + + #define QT_DECLARE_REVERSED_ORDERING_HELPER_PARTIAL(LeftType, RightType, Constexpr) \ + QT_DECLARE_REVERSED_ORDERING_HELPER_TEMPLATE(Qt::partial_ordering, LeftType, RightType, Constexpr) diff --git a/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h b/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h new file mode 100644 index 000000000000..6766a7584185 --- /dev/null +++ b/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h @@ -0,0 +1,18 @@ +Suppress warnings when -pedantic is passed and using std < c++20, which could +also be errors if -Werror is also passed as is the case with www/dooble. + +error: use of the 'nodiscard' attribute is a C++20 extension + +https://github.com/llvm/llvm-project/issues/32865 + +--- src/corelib/global/qcompilerdetection.h.orig 2024-01-22 10:20:09 UTC ++++ src/corelib/global/qcompilerdetection.h +@@ -964,7 +964,7 @@ + # define Q_REQUIRED_RESULT [[nodiscard]] + #endif + +-#if __has_cpp_attribute(nodiscard) >= 201907L /* used for both P1771 and P1301... */ ++#if __has_cpp_attribute(nodiscard) >= 201907L && (!defined(Q_CC_CLANG) || __cplusplus >= 201907L) /* used for both P1771 and P1301... */ + // [[nodiscard]] constructor (P1771) + # ifndef Q_NODISCARD_CTOR + # define Q_NODISCARD_CTOR [[nodiscard]] diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp b/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp index 15331f44334e..1fae16c7af55 100644 --- a/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp +++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp @@ -1,6 +1,6 @@ ---- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2023-09-21 19:24:26 UTC +--- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2023-09-15 10:20:51 UTC +++ src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp -@@ -17,11 +17,7 @@ +@@ -19,11 +19,7 @@ #include <mutex> diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp index 3f0e8a5a8dc0..3f65f6206cf6 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp @@ -1,4 +1,4 @@ ---- src/plugins/tls/openssl/qsslcontext_openssl.cpp.orig 2023-09-21 19:24:26 UTC +--- src/plugins/tls/openssl/qsslcontext_openssl.cpp.orig 2023-09-15 10:20:51 UTC +++ src/plugins/tls/openssl/qsslcontext_openssl.cpp @@ -49,9 +49,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, cons } @@ -41,7 +41,7 @@ #if QT_CONFIG(dtls) // DTLS cookies: -@@ -758,6 +760,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC +@@ -760,6 +762,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC } #endif // ocsp @@ -49,7 +49,7 @@ QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); if (cctx) { q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); -@@ -804,7 +807,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC +@@ -806,7 +809,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed")); sslContext->errorCode = QSslError::UnspecifiedError; } diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp index 902f6ae2be64..b8f5dfd475da 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp @@ -1,4 +1,4 @@ ---- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig 2023-11-15 13:58:42 UTC +--- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig 2024-03-19 15:46:43 UTC +++ src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp @@ -112,23 +112,36 @@ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, retur DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) @@ -37,19 +37,7 @@ #ifdef TLS1_3_VERSION DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) -@@ -154,7 +167,11 @@ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain - DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) - DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) - DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) -+#ifndef LIBRESSL_VERSION_NUMBER - DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) -+#else -+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) -+#endif - DEFINEFUNC3(int, CRYPTO_memcmp, const void * in_a, in_a, const void * in_b, in_b, size_t len, len, return 1, return); - DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) - DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return) -@@ -193,7 +210,9 @@ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int +@@ -193,7 +206,9 @@ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, return 0, return) DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) @@ -59,7 +47,7 @@ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) -@@ -214,7 +233,9 @@ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char ** +@@ -214,7 +229,9 @@ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char ** DEFINEFUNC2(int, ASN1_INTEGER_cmp, const ASN1_INTEGER *a, a, const ASN1_INTEGER *b, b, return 1, return) DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a, return 0, return) DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return) @@ -69,7 +57,7 @@ DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return) DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return nullptr, return) -@@ -289,12 +310,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const +@@ -289,12 +306,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -1, return) DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) @@ -84,7 +72,7 @@ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) -@@ -761,8 +784,8 @@ static LoadedOpenSsl loadOpenSsl() +@@ -761,8 +780,8 @@ static LoadedOpenSsl loadOpenSsl() libcrypto->setFileNameAndVersion("crypto"_L1, shlibVersion); #elif defined(SHLIB_VERSION_NUMBER) // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER> @@ -95,7 +83,7 @@ #endif // OPENSSL_SHLIB_VERSION if (libcrypto->load() && libssl->load()) { -@@ -795,8 +818,8 @@ static LoadedOpenSsl loadOpenSsl() +@@ -795,8 +814,8 @@ static LoadedOpenSsl loadOpenSsl() libssl->setFileNameAndVersion("ssl"_L1 + suffix, -1); libcrypto->setFileNameAndVersion("crypto"_L1 + suffix, -1); # else @@ -106,7 +94,7 @@ # endif if (libcrypto->load() && libssl->load()) { // libssl.so.0 and libcrypto.so.0 found -@@ -865,21 +888,34 @@ bool q_resolveOpenSslSymbols() +@@ -865,21 +884,34 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EVP_CIPHER_CTX_reset) RESOLVEFUNC(AUTHORITY_INFO_ACCESS_free) RESOLVEFUNC(EVP_PKEY_up_ref) @@ -141,7 +129,7 @@ #ifdef TLS1_3_VERSION RESOLVEFUNC(SSL_CTX_set_ciphersuites) RESOLVEFUNC(SSL_set_psk_use_session_callback) -@@ -961,7 +997,9 @@ bool q_resolveOpenSslSymbols() +@@ -961,7 +993,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(OCSP_check_validity) RESOLVEFUNC(OCSP_cert_to_id) RESOLVEFUNC(OCSP_id_get0_info) @@ -152,7 +140,7 @@ RESOLVEFUNC(OCSP_basic_sign) RESOLVEFUNC(OCSP_response_create) RESOLVEFUNC(i2d_OCSP_RESPONSE) -@@ -1056,12 +1094,14 @@ bool q_resolveOpenSslSymbols() +@@ -1056,12 +1090,14 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_CTX_use_PrivateKey) RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) RESOLVEFUNC(SSL_CTX_get_cert_store); @@ -167,7 +155,7 @@ RESOLVEFUNC(SSL_accept) RESOLVEFUNC(SSL_clear) RESOLVEFUNC(SSL_connect) -@@ -1121,7 +1161,9 @@ bool q_resolveOpenSslSymbols() +@@ -1121,7 +1157,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(RSA_free) RESOLVEFUNC(DH_bits) diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h index 911ffd8d9f99..0f92172a0f4c 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h @@ -1,4 +1,4 @@ ---- src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h.orig 2023-09-13 16:02:48 UTC +--- src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h.orig 2024-03-19 15:46:43 UTC +++ src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h @@ -46,6 +46,13 @@ QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ int q_SSL_session_reused(SSL *a); qssloptions q_SSL_CTX_set_options(SSL_CTX *ctx, qssloptions op); int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); -@@ -237,9 +261,15 @@ STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE +@@ -237,8 +261,13 @@ STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \ | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) @@ -59,11 +59,9 @@ +#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) +#endif // LIBRESSL_VERSION_NUMBER -+ #define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ | OPENSSL_INIT_ADD_ALL_DIGESTS \ - | OPENSSL_INIT_LOAD_CONFIG, NULL) -@@ -423,12 +453,14 @@ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a) +@@ -423,12 +452,14 @@ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a) int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); @@ -78,7 +76,7 @@ void q_SSL_free(SSL *a); STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a); const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); -@@ -536,14 +568,26 @@ void q_PKCS12_free(PKCS12 *pkcs12); +@@ -537,14 +568,26 @@ void q_PKCS12_free(PKCS12 *pkcs12); #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp) #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL) #define q_SSL_CTX_set_mode(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL) @@ -105,43 +103,3 @@ #define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i)) #define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \ q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509) -@@ -645,7 +689,11 @@ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash - int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash, - ASN1_INTEGER **pserial, OCSP_CERTID *cid); - -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL -+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs) -+#else - const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs); -+#endif - OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer); - void q_OCSP_CERTID_free(OCSP_CERTID *cid); - int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); -@@ -664,8 +712,15 @@ void *q_CRYPTO_malloc(size_t num, const char *file, in - - void *q_CRYPTO_malloc(size_t num, const char *file, int line); - #define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0) -+ -+#ifndef LIBRESSL_VERSION_NUMBER - void q_CRYPTO_free(void *str, const char *file, int line); - # define q_OPENSSL_free(addr) q_CRYPTO_free(addr, "", 0) -+#else -+void q_CRYPTO_free(void *a); -+# define q_OPENSSL_free(addr) q_CRYPTO_free(addr) -+#endif -+ - int q_CRYPTO_memcmp(const void * in_a, const void * in_b, size_t len); - - void q_SSL_set_info_callback(SSL *ssl, void (*cb) (const SSL *ssl, int type, int val)); -@@ -729,7 +784,11 @@ int q_RSA_bits(RSA *a); - - int q_DH_bits(DH *dh); - int q_RSA_bits(RSA *a); -+#if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x3050000fL) -+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p) -+#else - int q_DSA_bits(DSA *a); -+#endif - - int q_EVP_PKEY_assign(EVP_PKEY *a, int b, void *r); - int q_EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b); diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp index 2c822ea8c44c..a391e32bdd42 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp @@ -1,48 +1,6 @@ ---- src/plugins/tls/openssl/qx509_openssl.cpp.orig 2023-09-21 19:24:26 UTC +--- src/plugins/tls/openssl/qx509_openssl.cpp.orig 2024-03-19 15:46:43 UTC +++ src/plugins/tls/openssl/qx509_openssl.cpp -@@ -64,7 +64,12 @@ QMultiMap<QByteArray, QString> mapFromX509Name(X509_NA - unsigned char *data = nullptr; - int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); - info.insert(name, QString::fromUtf8((char*)data, size)); -- q_CRYPTO_free(data, nullptr, 0); -+#ifndef LIBRESSL_VERSION_NUMBER -+ q_CRYPTO_free(data, nullptr, 0); -+#else -+ q_CRYPTO_free(data); -+#endif -+ - } - - return info; -@@ -75,11 +80,27 @@ QDateTime dateTimeFromASN1(const ASN1_TIME *aTime) - QDateTime result; - tm lTime; - -+#if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x3060000fL) -+ const char *data; -+ size_t len; -+ int type; -+ -+ data = (const char*)ASN1_STRING_get0_data((const ASN1_STRING *)aTime); -+ len = ASN1_STRING_length(aTime); -+ type = ASN1_STRING_type(aTime); -+ -+ if (ASN1_time_parse(data, len, &lTime, type) == type) { -+ QDate resDate(lTime.tm_year + 1900, lTime.tm_mon + 1, lTime.tm_mday); -+ QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec); -+ result = QDateTime(resDate, resTime, Qt::UTC); -+ } -+#else - if (q_ASN1_TIME_to_tm(aTime, &lTime)) { - QDate resDate(lTime.tm_year + 1900, lTime.tm_mon + 1, lTime.tm_mday); - QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec); - result = QDateTime(resDate, resTime, QTimeZone::UTC); - } -+#endif - - return result; - } -@@ -190,7 +211,11 @@ QVariant x509UnknownExtensionToValue(X509_EXTENSION *e +@@ -190,7 +190,11 @@ QVariant x509UnknownExtensionToValue(X509_EXTENSION *e QVariantList list; bool isMap = false; @@ -54,7 +12,7 @@ CONF_VALUE *nval = q_SKM_sk_value(CONF_VALUE, val, j); if (nval->name && nval->value) { isMap = true; -@@ -286,7 +311,11 @@ QVariant x509ExtensionToValue(X509_EXTENSION *ext) +@@ -286,7 +290,11 @@ QVariant x509ExtensionToValue(X509_EXTENSION *ext) if (!info) return {}; QVariantMap result; diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist index f9441889733f..8ebb068d2b74 100644 --- a/devel/qt6-base/pkg-plist +++ b/devel/qt6-base/pkg-plist @@ -30,7 +30,6 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstractitemmodel_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstractproxymodel_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qanimationgroup_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qatomicscopedvaluerollback_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarbackend_p.h @@ -42,6 +41,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcore_unix_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcoreapplication_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcorecmdlineargs_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcoreevent_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatastream_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdataurl_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatetime_p.h @@ -72,6 +72,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_iterator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfunctions_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfutex_freebsd_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfutex_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfutureinterface_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfuturewatcher_p.h @@ -144,6 +145,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsharedmemory_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsimd_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsimd_x86_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsingleshottimer_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qspan_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstorageinfo_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringalgorithms_p.h @@ -200,6 +202,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QAtomicInt %%QT_INCDIR%%/QtCore/QAtomicInteger %%QT_INCDIR%%/QtCore/QAtomicPointer +%%QT_INCDIR%%/QtCore/QAtomicScopedValueRollback %%QT_INCDIR%%/QtCore/QBEInteger %%QT_INCDIR%%/QtCore/QBaseIterator %%QT_INCDIR%%/QtCore/QBasicMutex @@ -252,7 +255,6 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QDeadlineTimer %%QT_INCDIR%%/QtCore/QDebug %%QT_INCDIR%%/QtCore/QDebugStateSaver -%%QT_INCDIR%%/QtCore/QDeferredDeleteEvent %%QT_INCDIR%%/QtCore/QDir %%QT_INCDIR%%/QtCore/QDirIterator %%QT_INCDIR%%/QtCore/QDynamicPropertyChangeEvent @@ -461,11 +463,13 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QSocketDescriptor %%QT_INCDIR%%/QtCore/QSocketNotifier %%QT_INCDIR%%/QtCore/QSortFilterProxyModel +%%QT_INCDIR%%/QtCore/QSpan %%QT_INCDIR%%/QtCore/QSpecialInteger %%QT_INCDIR%%/QtCore/QStack %%QT_INCDIR%%/QtCore/QStandardPaths %%QT_INCDIR%%/QtCore/QStaticByteArrayMatcher %%QT_INCDIR%%/QtCore/QStaticByteArrayMatcherBase +%%QT_INCDIR%%/QtCore/QStaticLatin1StringMatcher %%QT_INCDIR%%/QtCore/QStaticPlugin %%QT_INCDIR%%/QtCore/QStorageInfo %%QT_INCDIR%%/QtCore/QString @@ -487,6 +491,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QSystemSemaphore %%QT_INCDIR%%/QtCore/QTaggedIterator %%QT_INCDIR%%/QtCore/QTaggedPointer +%%QT_INCDIR%%/QtCore/QTemplatedMetaMethodReturnArgument %%QT_INCDIR%%/QtCore/QTemporaryDir %%QT_INCDIR%%/QtCore/QTemporaryFile %%QT_INCDIR%%/QtCore/QTextBoundaryFinder @@ -589,8 +594,10 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/q20chrono.h %%QT_INCDIR%%/QtCore/q20functional.h %%QT_INCDIR%%/QtCore/q20iterator.h +%%QT_INCDIR%%/QtCore/q20map.h %%QT_INCDIR%%/QtCore/q20memory.h %%QT_INCDIR%%/QtCore/q20type_traits.h +%%QT_INCDIR%%/QtCore/q20vector.h %%QT_INCDIR%%/QtCore/q23functional.h %%QT_INCDIR%%/QtCore/q23utility.h %%QT_INCDIR%%/QtCore/qabstractanimation.h @@ -609,6 +616,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qassociativeiterable.h %%QT_INCDIR%%/QtCore/qatomic.h %%QT_INCDIR%%/QtCore/qatomic_cxx11.h +%%QT_INCDIR%%/QtCore/qatomicscopedvaluerollback.h %%QT_INCDIR%%/QtCore/qbasicatomic.h %%QT_INCDIR%%/QtCore/qbasictimer.h %%QT_INCDIR%%/QtCore/qbindingstorage.h @@ -634,6 +642,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qcommandlineparser.h %%QT_INCDIR%%/QtCore/qcompare.h %%QT_INCDIR%%/QtCore/qcompare_impl.h +%%QT_INCDIR%%/QtCore/qcomparehelpers.h %%QT_INCDIR%%/QtCore/qcompilerdetection.h %%QT_INCDIR%%/QtCore/qconcatenatetablesproxymodel.h %%QT_INCDIR%%/QtCore/qconfig.h @@ -765,8 +774,10 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qsize.h %%QT_INCDIR%%/QtCore/qsocketnotifier.h %%QT_INCDIR%%/QtCore/qsortfilterproxymodel.h +%%QT_INCDIR%%/QtCore/qspan.h %%QT_INCDIR%%/QtCore/qstack.h %%QT_INCDIR%%/QtCore/qstandardpaths.h +%%QT_INCDIR%%/QtCore/qstaticlatin1stringmatcher.h %%QT_INCDIR%%/QtCore/qstorageinfo.h %%QT_INCDIR%%/QtCore/qstring.h %%QT_INCDIR%%/QtCore/qstringalgorithms.h @@ -813,6 +824,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qtransposeproxymodel.h %%QT_INCDIR%%/QtCore/qtresource.h %%QT_INCDIR%%/QtCore/qtsan_impl.h +%%QT_INCDIR%%/QtCore/qtsymbolmacros.h %%QT_INCDIR%%/QtCore/qttranslation.h %%QT_INCDIR%%/QtCore/qttypetraits.h %%QT_INCDIR%%/QtCore/qtversion.h @@ -838,6 +850,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qxmlstream.h %%QT_INCDIR%%/QtCore/qxpfunctional.h %%QT_INCDIR%%/QtCore/qxptype_traits.h +%%QT_INCDIR%%/QtCore/qyieldcpu.h %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/dbus_minimal_p.h %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbus_symbols_p.h %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusabstractadaptor_p.h @@ -892,7 +905,6 @@ bin/qmake6 %%QT_INCDIR%%/QtDBus/qdbuserror.h %%QT_INCDIR%%/QtDBus/qdbusextratypes.h %%QT_INCDIR%%/QtDBus/qdbusinterface.h -%%QT_INCDIR%%/QtDBus/qdbusmacros.h %%QT_INCDIR%%/QtDBus/qdbusmessage.h %%QT_INCDIR%%/QtDBus/qdbusmetatype.h %%QT_INCDIR%%/QtDBus/qdbuspendingcall.h @@ -1129,6 +1141,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformintegration.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformintegrationfactory_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformintegrationplugin.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformkeymapper.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformmenu.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformmenu_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformnativeinterface.h @@ -1192,6 +1205,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/QBrush %%QT_INCDIR%%/QtGui/QBrushData %%QT_INCDIR%%/QtGui/QBrushDataPointerDeleter +%%QT_INCDIR%%/QtGui/QChildWindowEvent %%QT_INCDIR%%/QtGui/QClipboard %%QT_INCDIR%%/QtGui/QCloseEvent %%QT_INCDIR%%/QtGui/QColor @@ -1462,6 +1476,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/qrgba64.h %%QT_INCDIR%%/QtGui/qrgbafloat.h %%QT_INCDIR%%/QtGui/qscreen.h +%%QT_INCDIR%%/QtGui/qscreen_platform.h %%QT_INCDIR%%/QtGui/qsessionmanager.h %%QT_INCDIR%%/QtGui/qshortcut.h %%QT_INCDIR%%/QtGui/qstandarditemmodel.h @@ -1544,6 +1559,7 @@ bin/qmake6 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhostinfo_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhsts_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhstsstore_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttp2connection_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttp2protocolhandler_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpheaderparser_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpmultipart_p.h @@ -1581,8 +1597,11 @@ bin/qmake6 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyhttpimpl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyimpl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkrequest_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkrequestfactory_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qocsp_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qocspresponse_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qrestaccessmanager_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qrestreply_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsocks5socketengine_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qssl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcertificate_p.h @@ -1612,6 +1631,7 @@ bin/qmake6 %%QT_INCDIR%%/QtNetwork/QDnsTextRecord %%DTLS%%%%QT_INCDIR%%/QtNetwork/QDtls %%DTLS%%%%QT_INCDIR%%/QtNetwork/QDtlsClientVerifier +%%QT_INCDIR%%/QtNetwork/QHttpHeaders %%QT_INCDIR%%/QtNetwork/QHostAddress %%QT_INCDIR%%/QtNetwork/QHostInfo %%QT_INCDIR%%/QtNetwork/QHstsPolicy @@ -1636,8 +1656,11 @@ bin/qmake6 %%QT_INCDIR%%/QtNetwork/QNetworkProxyQuery %%QT_INCDIR%%/QtNetwork/QNetworkReply %%QT_INCDIR%%/QtNetwork/QNetworkRequest +%%QT_INCDIR%%/QtNetwork/QNetworkRequestFactory %%QT_INCDIR%%/QtNetwork/QOcspResponse %%QT_INCDIR%%/QtNetwork/QPasswordDigestor +%%QT_INCDIR%%/QtNetwork/QRestAccessManager +%%QT_INCDIR%%/QtNetwork/QRestReply %%QT_INCDIR%%/QtNetwork/QSsl %%QT_INCDIR%%/QtNetwork/QSslCertificate %%QT_INCDIR%%/QtNetwork/QSslCertificateExtension @@ -1667,6 +1690,7 @@ bin/qmake6 %%QT_INCDIR%%/QtNetwork/qhstspolicy.h %%QT_INCDIR%%/QtNetwork/qhttp1configuration.h %%QT_INCDIR%%/QtNetwork/qhttp2configuration.h +%%QT_INCDIR%%/QtNetwork/qhttpheaders.h %%QT_INCDIR%%/QtNetwork/qhttpmultipart.h %%QT_INCDIR%%/QtNetwork/qlocalserver.h %%QT_INCDIR%%/QtNetwork/qlocalsocket.h @@ -1680,8 +1704,11 @@ bin/qmake6 %%QT_INCDIR%%/QtNetwork/qnetworkproxy.h %%QT_INCDIR%%/QtNetwork/qnetworkreply.h %%QT_INCDIR%%/QtNetwork/qnetworkrequest.h +%%QT_INCDIR%%/QtNetwork/qnetworkrequestfactory.h %%QT_INCDIR%%/QtNetwork/qocspresponse.h %%QT_INCDIR%%/QtNetwork/qpassworddigestor.h +%%QT_INCDIR%%/QtNetwork/qrestaccessmanager.h +%%QT_INCDIR%%/QtNetwork/qrestreply.h %%QT_INCDIR%%/QtNetwork/qssl.h %%QT_INCDIR%%/QtNetwork/qsslcertificate.h %%QT_INCDIR%%/QtNetwork/qsslcertificateextension.h @@ -1887,7 +1914,6 @@ bin/qmake6 %%QT_INCDIR%%/QtSql/QtSql %%QT_INCDIR%%/QtSql/QtSqlDepends %%QT_INCDIR%%/QtSql/QtSqlVersion -%%QT_INCDIR%%/QtSql/qsql.h %%QT_INCDIR%%/QtSql/qsqldatabase.h %%QT_INCDIR%%/QtSql/qsqldriver.h %%QT_INCDIR%%/QtSql/qsqldriverplugin.h @@ -1913,6 +1939,7 @@ bin/qmake6 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkmetric_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkperfevents_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarktimemeasurers_p.h +%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcomparisontesthelper_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcsvbenchmarklogger_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qemulationdetector_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qjunittestlogger_p.h @@ -1959,7 +1986,6 @@ bin/qmake6 %%QT_INCDIR%%/QtTest/qbenchmarkmetric.h %%QT_INCDIR%%/QtTest/qsignalspy.h %%QT_INCDIR%%/QtTest/qtest.h -%%QT_INCDIR%%/QtTest/qtest_global.h %%QT_INCDIR%%/QtTest/qtest_gui.h %%QT_INCDIR%%/QtTest/qtest_network.h %%QT_INCDIR%%/QtTest/qtest_widgets.h @@ -2052,6 +2078,7 @@ bin/qmake6 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qplaintextedit_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qproxystyle_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qpushbutton_p.h +%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qrhiwidget_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qscrollarea_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qscrollbar_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qscroller_p.h @@ -2205,6 +2232,7 @@ bin/qmake6 %%QT_INCDIR%%/QtWidgets/QProxyStyle %%QT_INCDIR%%/QtWidgets/QPushButton %%QT_INCDIR%%/QtWidgets/QRadioButton +%%QT_INCDIR%%/QtWidgets/QRhiWidget %%QT_INCDIR%%/QtWidgets/QRubberBand %%QT_INCDIR%%/QtWidgets/QScrollArea %%QT_INCDIR%%/QtWidgets/QScrollBar @@ -2369,6 +2397,7 @@ bin/qmake6 %%QT_INCDIR%%/QtWidgets/qproxystyle.h %%QT_INCDIR%%/QtWidgets/qpushbutton.h %%QT_INCDIR%%/QtWidgets/qradiobutton.h +%%QT_INCDIR%%/QtWidgets/qrhiwidget.h %%QT_INCDIR%%/QtWidgets/qrubberband.h %%QT_INCDIR%%/QtWidgets/qscrollarea.h %%QT_INCDIR%%/QtWidgets/qscrollbar.h @@ -2478,6 +2507,7 @@ lib/cmake/Qt6/FindMySQL.cmake lib/cmake/Qt6/FindOracle.cmake lib/cmake/Qt6/FindPPS.cmake lib/cmake/Qt6/FindPostgreSQL.cmake +lib/cmake/Qt6/FindRenderDoc.cmake lib/cmake/Qt6/FindSlog2.cmake lib/cmake/Qt6/FindTslib.cmake lib/cmake/Qt6/FindWrapAtomic.cmake @@ -2667,6 +2697,7 @@ lib/cmake/Qt6Core/Qt6CoreConfigureFileTemplate.in lib/cmake/Qt6Core/Qt6CoreDependencies.cmake lib/cmake/Qt6Core/Qt6CoreDeploySupport.cmake lib/cmake/Qt6Core/Qt6CoreMacros.cmake +lib/cmake/Qt6Core/Qt6CoreResourceInit.in.cpp lib/cmake/Qt6Core/Qt6CoreTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Core/Qt6CoreTargets.cmake lib/cmake/Qt6Core/Qt6CoreVersionlessTargets.cmake @@ -3074,8 +3105,8 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6widgets_%%CMAKE_BUILD_TYPE%%_metatypes.json %%X11%%%%QT_LIBDIR%%/metatypes/qt6xcbqpaprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6xml_%%CMAKE_BUILD_TYPE%%_metatypes.json -%%DEBUG%%%%QT_LIBDIR%%/objects-Debug/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o -%%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o +%%DEBUG%%%%QT_LIBDIR%%/objects-Debug/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o +%%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o %%QT_MKSPECDIR%%/aix-g++-64/qmake.conf %%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h %%QT_MKSPECDIR%%/aix-g++/qmake.conf @@ -3132,6 +3163,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_MKSPECDIR%%/common/uikit/clang.conf %%QT_MKSPECDIR%%/common/uikit/qmake.conf %%QT_MKSPECDIR%%/common/unix.conf +%%QT_MKSPECDIR%%/common/vxworks/qplatformdefs.h %%QT_MKSPECDIR%%/common/wasm/qplatformdefs.h %%QT_MKSPECDIR%%/common/wasm/wasm.conf %%QT_MKSPECDIR%%/common/watchos.conf @@ -3527,6 +3559,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-dcc/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/vxworks-clang/qplatformdefs.h %%QT_MKSPECDIR%%/wasm-emscripten-64/qmake.conf %%QT_MKSPECDIR%%/wasm-emscripten-64/qplatformdefs.h %%QT_MKSPECDIR%%/wasm-emscripten/qmake.conf @@ -3582,7 +3615,6 @@ libdata/pkgconfig/Qt6Sql.pc libdata/pkgconfig/Qt6Test.pc libdata/pkgconfig/Qt6Widgets.pc libdata/pkgconfig/Qt6Xml.pc -%%QT_TOOLDIR%%/android_emulator_launcher.sh %%QT_TOOLDIR%%/cmake_automoc_parser %%QT_TOOLDIR%%/ensure_pro_file.cmake %%QT_TOOLDIR%%/moc @@ -3590,6 +3622,7 @@ libdata/pkgconfig/Qt6Xml.pc %%QT_TOOLDIR%%/qt-cmake-private %%QT_TOOLDIR%%/qt-cmake-private-install.cmake %%QT_TOOLDIR%%/qt-cmake-standalone-test +%%QT_TOOLDIR%%/qt-internal-configure-examples %%QT_TOOLDIR%%/qt-internal-configure-tests %%QT_TOOLDIR%%/qt-testrunner.py %%QT_TOOLDIR%%/qvkgen @@ -3726,6 +3759,7 @@ libdata/pkgconfig/Qt6Xml.pc %%QT_DOCDIR%%/global/template/style/online.css %%QT_DOCDIR%%/global/template/style/tech_preview.svg %%QT_DOCDIR%%/global/template/style/theqtcompany.png +%%QT_DOCDIR%%/global/warninglimit.qdocconf %%QT_DATADIR%%/modules/Concurrent.json %%QT_DATADIR%%/modules/Core.json %%QT_DATADIR%%/modules/DBus.json |