summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Verria <doris.verria@qt.io>2022-11-02 10:33:12 +0100
committerDoris Verria <doris.verria@qt.io>2022-11-03 12:27:58 +0000
commit1b91eb9a9877281cbb985446b81d54086fbc57c9 (patch)
tree4c1fc4719d920a1bacbbcce1ebb4dfdbf8feb480
parentbc01f4e7c459a591f476dbd23d95ead4c48035ea (diff)
Add missing headers on iOS
Include these headers to fix top-level builds and warnings on iOS. Pick-to: 6.4 6.4.1 Change-Id: I35649f581f2caeed24276ec6751ed390603886a6 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
-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 0b1477f14..d1ac2b0c7 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