whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 5346404da6

Change-Id: Ib10d7822c514caaf40b6b36ee71947c034daf338
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
bb10
Mårten Nordheim 2024-01-17 10:06:29 +01:00
parent 88f5fc47eb
commit d77162a458
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/CMakeLists.txt
View File

@ -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

7
src/network/ssl/qsslsocket.cpp
View File

@ -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;
}