From fd8cec34965afc8ca6d7f5e844e8aab44e182c90 Mon Sep 17 00:00:00 2001 From: Mate Barany Date: Fri, 19 Jul 2024 13:47:42 +0200 Subject: [PATCH] Change type of variable qssl_dhparams_default_base64 From const char* to const char[] to address a "Character pointer is not const" Axivion warning. Task-number: QTBUG-125026 Pick-to: 6.8 6.7 6.5 Change-Id: I0d6606c6abde5b01ec250ffb4595c89a497b7c29 Reviewed-by: Marc Mutz --- src/network/ssl/qssldiffiehellmanparameters.cpp | 2 +- .../tst_qssldiffiehellmanparameters.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/ssl/qssldiffiehellmanparameters.cpp b/src/network/ssl/qssldiffiehellmanparameters.cpp index 7da14f3536c..538984d0bd1 100644 --- a/src/network/ssl/qssldiffiehellmanparameters.cpp +++ b/src/network/ssl/qssldiffiehellmanparameters.cpp @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE // The 2048-bit MODP group from RFC 3526 -Q_AUTOTEST_EXPORT const char *qssl_dhparams_default_base64 = +Q_AUTOTEST_EXPORT extern const char qssl_dhparams_default_base64[] = "MIIBCAKCAQEA///////////JD9qiIWjCNMTGYouA3BzRKQJOCIpnzHQCC76mOxObIlFKCHmO" "NATd75UZs806QxswKwpt8l8UN0/hNW1tUcJF5IW1dmJefsb0TELppjftawv/XLb0Brft7jhr" "+1qJn6WunyQRfEsf5kkoZlHs5Fs9wgB8uKFjvwWY2kg2HFXTmmkWP6j9JM9fg2VdI9yjrZYc" diff --git a/tests/auto/network/ssl/qssldiffiehellmanparameters/tst_qssldiffiehellmanparameters.cpp b/tests/auto/network/ssl/qssldiffiehellmanparameters/tst_qssldiffiehellmanparameters.cpp index d8c6d9158a3..5296749ae4b 100644 --- a/tests/auto/network/ssl/qssldiffiehellmanparameters/tst_qssldiffiehellmanparameters.cpp +++ b/tests/auto/network/ssl/qssldiffiehellmanparameters/tst_qssldiffiehellmanparameters.cpp @@ -11,7 +11,7 @@ // Default DH parameters, exported by qssldiffiehellmanparameters.cpp. QT_BEGIN_NAMESPACE -extern Q_AUTOTEST_EXPORT const char *qssl_dhparams_default_base64; +extern Q_AUTOTEST_EXPORT const char qssl_dhparams_default_base64[]; QT_END_NAMESPACE QT_USE_NAMESPACE