summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoris Verria <doris.verria@qt.io>2022-11-02 10:33:12 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-11-03 13:27:29 +0000
commit952e034c18dc6b57c589b4ab7bc715b44f6b0ab8 (patch)
treef12d6a7c75323e8664df5539fd4f26a81e6f8dae
parent79046c5d6130a6fc820c50e4e32338701f2eba58 (diff)
downloadqtmultimedia-952e034c18dc6b57c589b4ab7bc715b44f6b0ab8.tar.gz
Add missing headers on iOS
Include these headers to fix top-level builds and warnings on iOS. Change-Id: I35649f581f2caeed24276ec6751ed390603886a6 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 1b91eb9a9877281cbb985446b81d54086fbc57c9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/plugins/multimedia/darwin/camera/qavfcamerabase.mm1
-rw-r--r--src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox.mm3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/multimedia/darwin/camera/qavfcamerabase.mm b/src/plugins/multimedia/darwin/camera/qavfcamerabase.mm
index a11290a8d..b40c1133e 100644
--- a/src/plugins/multimedia/darwin/camera/qavfcamerabase.mm
+++ b/src/plugins/multimedia/darwin/camera/qavfcamerabase.mm
@@ -7,6 +7,7 @@
#include <private/qcameradevice_p.h>
#include "qavfhelpers_p.h"
#include <private/qplatformmediaintegration_p.h>
+#include <QtCore/qset.h>
QT_USE_NAMESPACE
diff --git a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox.mm b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox.mm
index db64f2003..a2e4e83ab 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox.mm
+++ b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox.mm
@@ -22,6 +22,9 @@
#ifdef Q_OS_MACOS
#import <AppKit/AppKit.h>
#endif
+#ifdef Q_OS_IOS
+#import <OpenGLES/EAGL.h>
+#endif
#import <Metal/Metal.h>
QT_BEGIN_NAMESPACE