From 9917f07978a093fe8f0b06a5400169ba36e36f97 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Wed, 27 Mar 2024 10:06:30 +0800 Subject: GStreamer: fix deprecation warnings Implicit conversion from `const char*` seems to be deprecated. Pick-to: 6.5 Change-Id: I00ae957d22f7d50696a0b10ccfd5746eddcc67ae Reviewed-by: Artem Dyomin (cherry picked from commit 1e7de0a8ffed840b8a6d7749fd92e4372cc18bf8) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit faacd06b61dadb82369eded51344b664892f88f4) --- src/plugins/multimedia/gstreamer/common/qgst_p.h | 3 ++- src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/multimedia/gstreamer/common/qgst_p.h b/src/plugins/multimedia/gstreamer/common/qgst_p.h index 26655a5a2..3123af7b2 100644 --- a/src/plugins/multimedia/gstreamer/common/qgst_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgst_p.h @@ -587,7 +587,8 @@ public: inline QString errorMessageCannotFindElement(std::string_view element) { - return QStringLiteral("Could not find the %1 GStreamer element").arg(element.data()); + return QStringLiteral("Could not find the %1 GStreamer element") + .arg(QLatin1StringView(element)); } QT_END_NAMESPACE diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer.cpp b/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer.cpp index e60df2bf2..e08319e03 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstreamermediaplayer.cpp @@ -633,7 +633,7 @@ void QGstreamerMediaPlayer::sourceSetupCallback(GstElement *uridecodebin, GstEle qCDebug(qLcMediaPlayer) << "Setting up source:" << g_type_name_from_instance((GTypeInstance*)source); - if (QLatin1String("GstRTSPSrc") == g_type_name_from_instance((GTypeInstance *)source)) { + if (std::string_view("GstRTSPSrc") == g_type_name_from_instance((GTypeInstance *)source)) { QGstElement s(source); int latency{40}; bool ok{false}; -- cgit v1.2.3