diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-05-19 17:52:20 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-05-24 11:28:54 +0200 |
| commit | e844a4212b4ea4605282dc059a7944ae6000182f (patch) | |
| tree | 05728b2662bb79235439f45a535f89a99bdf7564 /src | |
| parent | 8a565b9e9c6a793042352542a9110daeaf8d7c82 (diff) | |
Exclude source files from QFFmpegMediaPlugin when building for Android
Several symbols are redefined in these source files, e.g.,
AndroidImageFormat, AndroidImage, QtVideoDeviceManager. Excluding two
out of three of these files is sufficient for resolving the conflict;
however, I have added the third one as well, as a precautionary measure
because the names are quite common and may lead to similar issues later.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Ib0d3b0ec41762ab8e391efcbdce5c494ff5b296c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/multimedia/ffmpeg/CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/multimedia/ffmpeg/CMakeLists.txt b/src/plugins/multimedia/ffmpeg/CMakeLists.txt index 52c16306b..8f1544233 100644 --- a/src/plugins/multimedia/ffmpeg/CMakeLists.txt +++ b/src/plugins/multimedia/ffmpeg/CMakeLists.txt @@ -147,6 +147,11 @@ if (ANDROID) qandroidcameraframe_p.h qandroidcameraframe.cpp ../android/wrappers/jni/androidsurfacetexture_p.h ../android/wrappers/jni/androidsurfacetexture.cpp + NO_UNITY_BUILD_SOURCES + # Duplicate declration of JNI Classes using `Q_DECLARE_JNI_CLASS` + qandroidcamera.cpp + qandroidvideodevices.cpp + qandroidcameraframe.cpp INCLUDE_DIRECTORIES ${FFMPEG_DIR}/include ../android/wrappers/jni/ |