diff options
| author | Bartlomiej Moskal <bartlomiej.moskal@qt.io> | 2023-09-26 14:02:36 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-09-27 10:27:11 +0000 |
| commit | e992fb7aeecb9e38b7ae3e73a00cf9efd884492f (patch) | |
| tree | c7ea2f21c7c28367a3efb9f7690b409c29076e68 | |
| parent | 8ecb599ab1ffd820d0714165e8a1e71fe549809a (diff) | |
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 <artem.dyomin@qt.io>
(cherry picked from commit 03e6411af18767e195396a5043de444ec170d3b8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/multimedia/ffmpeg/qffmpegopensslsymbols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |