From e992fb7aeecb9e38b7ae3e73a00cf9efd884492f Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Tue, 26 Sep 2023 14:02:36 +0200 Subject: Android: fix compilation for FFmpeg with openSSL QByteArray type has no assignment operator for QString. Just use qEnvironmentVariable instead. Fixes: QTBUG-117599 Pick-to: 6.5 Change-Id: I0f779c4bf90f0276179e84bb2ff6b742906b8641 Reviewed-by: Artem Dyomin (cherry picked from commit 03e6411af18767e195396a5043de444ec170d3b8) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/multimedia/ffmpeg/qffmpegopensslsymbols.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/multimedia/ffmpeg/qffmpegopensslsymbols.cpp b/src/plugins/multimedia/ffmpeg/qffmpegopensslsymbols.cpp index 76a2b49ae..e0e5de137 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegopensslsymbols.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegopensslsymbols.cpp @@ -41,7 +41,7 @@ static Libs loadLibs() // openssl on Android has specific suffixes #if defined(Q_OS_ANDROID) { - auto suffix = qgetenv("ANDROID_OPENSSL_SUFFIX"); + auto suffix = qEnvironmentVariable("ANDROID_OPENSSL_SUFFIX"); if (suffix.isEmpty()) suffix = QString("_"_L1) + QString::number(majorVersion); -- cgit v1.2.3