Skip to content

Commit

Permalink
qt: patch qtmultimedia for Xcode 15
Browse files Browse the repository at this point in the history
  • Loading branch information
fxcoudert committed Oct 4, 2023
1 parent d2b5993 commit 7f1cffa
Showing 1 changed file with 31 additions and 0 deletions.
31 changes: 31 additions & 0 deletions qt/6.5.1-QTBUG-113782.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 82f7f3de0e90bb7d1447cb710ffd2e1b315ae479 Mon Sep 17 00:00:00 2001
From: Artem Dyomin <[email protected]>
Date: Fri, 26 May 2023 15:15:52 +0200
Subject: [PATCH] Remove std::unary_function usage

std::unary_function was removed with c++17

Pick-to: 6.5
Task-number: QTBUG-113782
Change-Id: I4e330cd1f89dc14936acbccdeee8378ea4938870
Reviewed-by: Lars Knoll <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Pavel Dubsky <[email protected]>
---

diff --git a/src/plugins/multimedia/darwin/camera/avfcamerautility.mm b/src/plugins/multimedia/darwin/camera/avfcamerautility.mm
index 4334613..fb73ba3 100644
--- a/src/plugins/multimedia/darwin/camera/avfcamerautility.mm
+++ b/src/plugins/multimedia/darwin/camera/avfcamerautility.mm
@@ -69,9 +69,9 @@
}
};

-struct FormatHasNoFPSRange : std::unary_function<AVCaptureDeviceFormat *, bool>
+struct FormatHasNoFPSRange
{
- bool operator() (AVCaptureDeviceFormat *format)
+ bool operator() (AVCaptureDeviceFormat *format) const
{
Q_ASSERT(format);
return !format.videoSupportedFrameRateRanges || !format.videoSupportedFrameRateRanges.count;

0 comments on commit 7f1cffa

Please sign in to comment.