diff options
Diffstat (limited to 'src/plugins/multimedia/android/CMakeLists.txt')
| -rw-r--r-- | src/plugins/multimedia/android/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/multimedia/android/CMakeLists.txt b/src/plugins/multimedia/android/CMakeLists.txt index c38648379..b66bd4e59 100644 --- a/src/plugins/multimedia/android/CMakeLists.txt +++ b/src/plugins/multimedia/android/CMakeLists.txt @@ -29,6 +29,12 @@ qt_internal_add_plugin(QAndroidMediaPlugin wrappers/jni/androidmultimediautils.cpp wrappers/jni/androidmultimediautils_p.h wrappers/jni/androidsurfacetexture.cpp wrappers/jni/androidsurfacetexture_p.h wrappers/jni/androidsurfaceview.cpp wrappers/jni/androidsurfaceview_p.h + NO_UNITY_BUILD_SOURCES + # Resolves two problems: + # - Collision of `rwLock` with wrappers/jni/androidmediaplayer.cpp + # - and redefinition of `notifyFrameAvailable` with different signature + # with wrappers/jni/androidsurfacetexture.cpp + wrappers/jni/androidcamera.cpp INCLUDE_DIRECTORIES audio common |