diff options
| author | Mårten Nordheim <[email protected]> | 2024-01-17 10:06:29 +0100 |
|---|---|---|
| committer | Mårten Nordheim <[email protected]> | 2024-01-18 14:18:00 +0100 |
| commit | d77162a458659575ab0d1e225909a31a3fed6868 (patch) | |
| tree | 3fe94a9f7be2638f7c8f241082b94049d59ede92 | |
| parent | 88f5fc47ebf558fa72b7b447f8394a0d44b6bf9d (diff) | |
Fix accidental implicit QBA->QString conversion
And make sure it cannot happen again by adding the
QT_NO_CAST_FROM_ASCII define to the Network module.
Amends 5346404da64ac87d161f510d9fee71899d7c70ba
Change-Id: Ib10d7822c514caaf40b6b36ee71947c034daf338
Reviewed-by: Ivan Solovev <[email protected]>
| -rw-r--r-- | src/network/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index f7a5dba8614..82b59af329e 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -57,6 +57,7 @@ qt_internal_add_module(Network QT_NO_CONTEXTLESS_CONNECT QT_NO_FOREACH QT_NO_USING_NAMESPACE + QT_NO_CAST_FROM_ASCII INCLUDE_DIRECTORIES kernel LIBRARIES diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index a763721828d..62c15c98d50 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -2967,10 +2967,9 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories() }; QList<QByteArray> result = QList<QByteArray>::fromReadOnlyData(dirs); if constexpr (isVxworks) { - static QString vxworksCertsDir = qgetenv("VXWORKS_CERTS_DIR"); - if (!vxworksCertsDir.isEmpty()) { - result.push_back(vxworksCertsDir.toLatin1()); - } + static QByteArray vxworksCertsDir = qgetenv("VXWORKS_CERTS_DIR"); + if (!vxworksCertsDir.isEmpty()) + result.push_back(vxworksCertsDir); } return result; } |