diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2023-07-11 10:31:03 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2025-08-26 15:22:08 +0000 |
| commit | b4738d37f02ebcf52535d69abf4eca45a86d7de1 (patch) | |
| tree | 7139ee667ed517498eb6326801bad76bd0d8e74b /src | |
| parent | 81ffb8c32c8535debe9cecda64b404b2ddf37f12 (diff) | |
Enable stricter build options for network plugins
A mix of QT_ENABLE_STRICT_MODE_UP_TO and QT_NO_CAST_FROM_ASCII
Disabling implicit conversions from ASCII makes it easier to avoid
unnecessary (unexpected) conversions.
And disabling contextless connects helps avoid annoying lifetime issues.
Change-Id: I4f695f2fe993e3e69fe49b0d7965a427150d69ae
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src')
9 files changed, 23 insertions, 0 deletions
diff --git a/src/plugins/networkinformation/android/CMakeLists.txt b/src/plugins/networkinformation/android/CMakeLists.txt index c08f1c71d2c..ab8f5ad6fde 100644 --- a/src/plugins/networkinformation/android/CMakeLists.txt +++ b/src/plugins/networkinformation/android/CMakeLists.txt @@ -29,6 +29,9 @@ qt_internal_add_plugin(QAndroidNetworkInformationPlugin wrapper/androidconnectivitymanager.cpp wrapper/androidconnectivitymanager.h LIBRARIES Qt::NetworkPrivate + DEFINES + "QT_ENABLE_STRICT_MODE_UP_TO=QT_VERSION_CHECK(6,11,0)" + QT_NO_CAST_FROM_ASCII ) set_property( diff --git a/src/plugins/networkinformation/apple/CMakeLists.txt b/src/plugins/networkinformation/apple/CMakeLists.txt index 546eb919c58..7594e92eac1 100644 --- a/src/plugins/networkinformation/apple/CMakeLists.txt +++ b/src/plugins/networkinformation/apple/CMakeLists.txt @@ -11,4 +11,7 @@ qt_internal_add_plugin(QAppleNetworkInformationPlugin LIBRARIES Qt::NetworkPrivate ${FWNetwork} + DEFINES + "QT_ENABLE_STRICT_MODE_UP_TO=QT_VERSION_CHECK(6,11,0)" + QT_NO_CAST_FROM_ASCII ) diff --git a/src/plugins/networkinformation/glib/CMakeLists.txt b/src/plugins/networkinformation/glib/CMakeLists.txt index 019f4f1358d..7a1dbabc3d9 100644 --- a/src/plugins/networkinformation/glib/CMakeLists.txt +++ b/src/plugins/networkinformation/glib/CMakeLists.txt @@ -13,5 +13,7 @@ qt_internal_add_plugin(QGlibNetworkInformationPlugin GLIB2::GOBJECT GLIB2::GIO DEFINES + "QT_ENABLE_STRICT_MODE_UP_TO=QT_VERSION_CHECK(6,11,0)" + QT_NO_CAST_FROM_ASCII QT_NO_SIGNALS_SLOTS_KEYWORDS ) diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt index acd3754f4e5..f471de5c2ab 100644 --- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt +++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt @@ -12,6 +12,9 @@ qt_internal_add_plugin(QNLMNIPlugin qnetworklistmanagerevents.h qnetworklistmanagerevents.cpp LIBRARIES Qt::NetworkPrivate + DEFINES + "QT_ENABLE_STRICT_MODE_UP_TO=QT_VERSION_CHECK(6,11,0)" + QT_NO_CAST_FROM_ASCII ) qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32 diff --git a/src/plugins/networkinformation/networkmanager/CMakeLists.txt b/src/plugins/networkinformation/networkmanager/CMakeLists.txt index 9d76dbe7b4d..555ab7b13cc 100644 --- a/src/plugins/networkinformation/networkmanager/CMakeLists.txt +++ b/src/plugins/networkinformation/networkmanager/CMakeLists.txt @@ -14,4 +14,7 @@ qt_internal_add_plugin(QNetworkManagerNetworkInformationPlugin LIBRARIES Qt::DBus Qt::NetworkPrivate + DEFINES + "QT_ENABLE_STRICT_MODE_UP_TO=QT_VERSION_CHECK(6,11,0)" + QT_NO_CAST_FROM_ASCII ) diff --git a/src/plugins/tls/certonly/CMakeLists.txt b/src/plugins/tls/certonly/CMakeLists.txt index 495f4081443..0afe27608ff 100644 --- a/src/plugins/tls/certonly/CMakeLists.txt +++ b/src/plugins/tls/certonly/CMakeLists.txt @@ -17,4 +17,7 @@ qt_internal_add_plugin(QTlsBackendCertOnlyPlugin qtlsbackend_cert_p.h LIBRARIES Qt::NetworkPrivate + DEFINES + "QT_ENABLE_STRICT_MODE_UP_TO=QT_VERSION_CHECK(6,11,0)" + QT_NO_CAST_FROM_ASCII ) diff --git a/src/plugins/tls/openssl/CMakeLists.txt b/src/plugins/tls/openssl/CMakeLists.txt index 0e0a7a1552d..f90d9c2eda1 100644 --- a/src/plugins/tls/openssl/CMakeLists.txt +++ b/src/plugins/tls/openssl/CMakeLists.txt @@ -22,6 +22,8 @@ qt_internal_add_plugin(QTlsBackendOpenSSLPlugin Qt::CorePrivate DEFINES OPENSSL_API_COMPAT=0x10100000L + "QT_ENABLE_STRICT_MODE_UP_TO=QT_VERSION_CHECK(6,11,0)" + QT_NO_CAST_FROM_ASCII ) if (WIN32) # Windows header issues diff --git a/src/plugins/tls/schannel/CMakeLists.txt b/src/plugins/tls/schannel/CMakeLists.txt index a7f7fcd99f2..567ef75d239 100644 --- a/src/plugins/tls/schannel/CMakeLists.txt +++ b/src/plugins/tls/schannel/CMakeLists.txt @@ -30,5 +30,6 @@ qt_internal_add_plugin(QSchannelBackendPlugin bcrypt ncrypt DEFINES + "QT_ENABLE_STRICT_MODE_UP_TO=QT_VERSION_CHECK(6,11,0)" QT_NO_CAST_FROM_ASCII ) diff --git a/src/plugins/tls/securetransport/CMakeLists.txt b/src/plugins/tls/securetransport/CMakeLists.txt index bb560229e81..05616e29c71 100644 --- a/src/plugins/tls/securetransport/CMakeLists.txt +++ b/src/plugins/tls/securetransport/CMakeLists.txt @@ -32,4 +32,7 @@ qt_internal_add_plugin(QSecureTransportBackendPlugin Qt::CorePrivate ${FWCoreFoundation} ${FWSecurity} + DEFINES + "QT_ENABLE_STRICT_MODE_UP_TO=QT_VERSION_CHECK(6,11,0)" + QT_NO_CAST_FROM_ASCII ) |